Clean up unit tests

- use the unified functional pmsh test case
- fix some sonar lint issues

Issue-ID: POLICY-3945
Change-Id: Ic49ea9494cde88a8e0d37260d1461b9775ec9ed5
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

36 files changed, 355 insertions, 1299 deletions

diff --git a/models/pom.xml b/models/pom.xml
index ad70f4f64..71fbdb15d 100644
--- a/models/pom.xml
+++ b/models/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
+  Copyright (C) 2021-2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -41,4 +41,25 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <version>1.7.0</version>
+                <configuration>
+                    <resourceBundles>
+                        <resourceBundle>org.onap.policy.clamp:policy-clamp-examples:${project.version}</resourceBundle>
+                    </resourceBundles>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.java
index ee79b27b7..070fa8dc8 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Instant;
 import java.util.UUID;
@@ -39,18 +39,17 @@ class AcElementStatisticsTest {
 
         assertThat(aces0.toString()).contains("AcElementStatistics(");
         assertThat(aces0.hashCode()).isNotZero();
-        assertEquals(true, aces0.equals(aces0));
-        assertEquals(false, aces0.equals(null));
-
+        assertEquals(aces0, aces0);
+        assertNotEquals(null, aces0);
 
         AcElementStatistics aces1 = new AcElementStatistics();
         aces1.setParticipantId(new ToscaConceptIdentifier("defName", "0.0.1"));
         aces1.setTimeStamp(Instant.now());
 
         assertThat(aces1.toString()).contains("AcElementStatistics(");
-        assertEquals(false, aces1.hashCode() == 0);
-        assertEquals(false, aces1.equals(aces0));
-        assertEquals(false, aces1.equals(null));
+        assertNotEquals(0, aces1.hashCode());
+        assertNotEquals(aces1, aces0);
+        assertNotEquals(null, aces1);
 
         assertNotEquals(aces1, aces0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java
index 4e739db52..3fd102b31 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
@@ -34,6 +34,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 class AutomationCompositionElementTest {
     @Test
     void testAutomationCompositionElement() {
+        assertNotNull(new AutomationCompositionElement());
         var ace0 = new AutomationCompositionElement();
         var ace1 = new AutomationCompositionElement(ace0);
         assertEquals(ace0, ace1);
@@ -64,13 +65,12 @@ class AutomationCompositionElementTest {
 
     @Test
     void testAutomationCompositionElementLombok() {
-        assertNotNull(new AutomationCompositionElement());
         var ace0 = new AutomationCompositionElement();
 
         assertThat(ace0.toString()).contains("AutomationCompositionElement(");
         assertThat(ace0.hashCode()).isNotZero();
-        assertEquals(true, ace0.equals(ace0));
-        assertEquals(false, ace0.equals(null));
+        assertEquals(ace0, ace0);
+        assertNotEquals(null, ace0);
 
         var ace1 = new AutomationCompositionElement();
 
@@ -82,9 +82,9 @@ class AutomationCompositionElementTest {
         ace1.setState(AutomationCompositionState.UNINITIALISED);
 
         assertThat(ace1.toString()).contains("AutomationCompositionElement(");
-        assertEquals(false, ace1.hashCode() == 0);
-        assertEquals(false, ace1.equals(ace0));
-        assertEquals(false, ace1.equals(null));
+        assertNotEquals(0, ace1.hashCode());
+        assertNotEquals(ace1, ace0);
+        assertNotEquals(null, ace1);
 
         assertNotEquals(ace1, ace0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.java
index ad8a1bbea..49953f1af 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.time.Instant;
 import java.util.LinkedHashMap;
@@ -57,8 +57,8 @@ class AutomationCompositionTest {
 
         assertThat(ac0.toString()).contains("AutomationComposition(");
         assertThat(ac0.hashCode()).isNotZero();
-        assertEquals(true, ac0.equals(ac0));
-        assertEquals(false, ac0.equals(null));
+        assertEquals(ac0, ac0);
+        assertNotEquals(null, ac0);
 
         var ac1 = new AutomationComposition();
 
@@ -71,9 +71,9 @@ class AutomationCompositionTest {
         ac1.setVersion("0.0.1");
 
         assertThat(ac1.toString()).contains("AutomationComposition(");
-        assertEquals(false, ac1.hashCode() == 0);
-        assertEquals(false, ac1.equals(ac0));
-        assertEquals(false, ac1.equals(null));
+        assertNotEquals(0, ac1.hashCode());
+        assertNotEquals(ac1, ac0);
+        assertNotEquals(null, ac1);
 
         assertNotEquals(ac1, ac0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.java
index de9b884d3..727ab7033 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Instant;
 import org.junit.jupiter.api.Test;
@@ -38,8 +38,8 @@ class ParticipantStatisticsTest {
 
         assertThat(ps0.toString()).contains("ParticipantStatistics(");
         assertThat(ps0.hashCode()).isNotZero();
-        assertEquals(true, ps0.equals(ps0));
-        assertEquals(false, ps0.equals(null));
+        assertEquals(ps0, ps0);
+        assertNotEquals(null, ps0);
 
 
         ParticipantStatistics ps1 = new ParticipantStatistics();
@@ -47,9 +47,9 @@ class ParticipantStatisticsTest {
         ps1.setTimeStamp(Instant.now());
 
         assertThat(ps1.toString()).contains("ParticipantStatistics(");
-        assertEquals(false, ps1.hashCode() == 0);
-        assertEquals(false, ps1.equals(ps0));
-        assertEquals(false, ps1.equals(null));
+        assertNotEquals(0, ps1.hashCode());
+        assertNotEquals(ps1, ps0);
+        assertNotEquals(null, ps1);
 
         assertNotEquals(ps1, ps0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.java
index 164c7c1a0..554c1b04d 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,11 @@ package org.onap.policy.clamp.models.acm.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
@@ -51,8 +53,8 @@ class ParticipantTest {
 
         assertThat(p0.toString()).contains("Participant(");
         assertThat(p0.hashCode()).isNotZero();
-        assertEquals(true, p0.equals(p0));
-        assertEquals(false, p0.equals(null));
+        assertEquals(p0, p0);
+        assertNotEquals(null, p0);
 
 
         Participant p1 = new Participant();
@@ -65,9 +67,9 @@ class ParticipantTest {
         p1.setVersion("0.0.1");
 
         assertThat(p1.toString()).contains("Participant(");
-        assertEquals(false, p1.hashCode() == 0);
-        assertEquals(false, p1.equals(p0));
-        assertEquals(false, p1.equals(null));
+        assertNotEquals(0, p1.hashCode());
+        assertNotEquals(p1, p0);
+        assertNotEquals(null, p1);
 
         assertNotEquals(p1, p0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.java
index 5252221a8..77b3cccf8 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/concepts/ParticipantUtilsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 class ParticipantUtilsTest {
 
     private static final Coder CODER = new StandardCoder();
-    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/PMSubscriptionHandling.yaml";
+    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/test-pm-subscription-handling.yaml";
     private static final String AUTOMATION_COMPOSITION_JSON =
         "src/test/resources/providers/TestAutomationCompositions.json";
     private static final String AUTOMATION_COMPOSITION_ELEMENT =
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.java
index 49bb719ac..5902b935d 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionNotificationTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,11 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.notification;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,24 +43,24 @@ class AutomationCompositionNotificationTest {
         List<AutomationCompositionStatus> deletedList = new ArrayList<>();
         deletedList.add(new AutomationCompositionStatus());
 
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
 
         acn0.setAdded(addedList);
-        assertEquals(false, acn0.isEmpty());
+        assertFalse(acn0.isEmpty());
         acn0.setAdded(null);
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
 
         acn0.setDeleted(deletedList);
-        assertEquals(false, acn0.isEmpty());
+        assertFalse(acn0.isEmpty());
         acn0.setDeleted(null);
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
 
         acn0.setAdded(addedList);
         acn0.setDeleted(deletedList);
-        assertEquals(false, acn0.isEmpty());
+        assertFalse(acn0.isEmpty());
         acn0.setAdded(null);
         acn0.setDeleted(null);
-        assertEquals(true, acn0.isEmpty());
+        assertTrue(acn0.isEmpty());
     }
 
     @Test
@@ -68,16 +71,16 @@ class AutomationCompositionNotificationTest {
         AutomationCompositionNotification acn0 = new AutomationCompositionNotification();
 
         assertThat(acn0.toString()).contains("AutomationCompositionNotification(");
-        assertEquals(false, acn0.hashCode() == 0);
-        assertEquals(true, acn0.equals(acn0));
-        assertEquals(false, acn0.equals(null));
+        assertNotEquals(0, acn0.hashCode());
+        assertEquals(acn0, acn0);
+        assertNotEquals(null, acn0);
 
 
         AutomationCompositionNotification acn1 = new AutomationCompositionNotification();
 
         assertThat(acn1.toString()).contains("AutomationCompositionNotification(");
-        assertEquals(false, acn1.hashCode() == 0);
-        assertEquals(true, acn1.equals(acn0));
-        assertEquals(false, acn1.equals(null));
+        assertNotEquals(0, acn1.hashCode());
+        assertEquals(acn1, acn0);
+        assertNotEquals(null, acn1);
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.java
index 028566888..d4e3004a8 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/notification/AutomationCompositionStatusTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.notification;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
@@ -38,11 +39,11 @@ class AutomationCompositionStatusTest {
         AutomationCompositionStatus acn0 = new AutomationCompositionStatus();
 
         assertThat(acn0.toString()).contains("AutomationCompositionStatus(");
-        assertEquals(false, acn0.hashCode() == 0);
-        assertEquals(true, acn0.equals(acn0));
-        assertEquals(false, acn0.equals(null));
+        assertNotEquals(0, acn0.hashCode());
+        assertEquals(acn0, acn0);
+        assertNotEquals(null, acn0);
 
         AutomationCompositionStatus acn1 = new AutomationCompositionStatus();
-        assertEquals(true, acn1.equals(acn0));
+        assertEquals(acn1, acn0);
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.java
index 383a55115..c750610d4 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionAckTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.java
index 6c48afad2..6e8f41a4f 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChangeTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.java
index 809256d40..1d56bc9ee 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionUpdateTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.java
index 89a34e33d..276d36887 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantAckMessageTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 
 import java.util.UUID;
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.java
index 59a6d826b..fc8d9a174 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterAckTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.java
index 873257696..d8dd15dbd 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantDeregisterTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.java
index fa16d145d..1d7e7b02f 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantMessageTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 
 import java.time.Instant;
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.java
index 10200d86f..e18806e4e 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterAckTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.java
index d08acda47..215f4a9ec 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRegisterTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.java
index 92025a707..11a26d007 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusReqTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.java
index a33c12f2e..37cde2549 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatusTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.java
index 9f011a383..e2c3454a4 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateAckTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.java
index f8aaffe11..dd49e1355 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantUpdateTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 package org.onap.policy.clamp.models.acm.messages.dmaap.participant;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.assertSerializable;
 import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageUtils.removeVariableFields;
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.java
index 348359743..579631604 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/rest/instantiation/InstantiationCommandTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
 package org.onap.policy.clamp.models.acm.messages.rest.instantiation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.ArrayList;
 import org.junit.jupiter.api.Test;
@@ -36,9 +36,9 @@ class InstantiationCommandTest {
         InstantiationCommand ic0 = new InstantiationCommand();
 
         assertThat(ic0.toString()).contains("InstantiationCommand(");
-        assertEquals(false, ic0.hashCode() == 0);
-        assertEquals(true, ic0.equals(ic0));
-        assertEquals(false, ic0.equals(null));
+        assertNotEquals(0, ic0.hashCode());
+        assertEquals(ic0, ic0);
+        assertNotEquals(null, ic0);
 
 
         InstantiationCommand ic1 = new InstantiationCommand();
@@ -47,9 +47,9 @@ class InstantiationCommandTest {
         ic1.setOrderedState(AutomationCompositionOrderedState.UNINITIALISED);
 
         assertThat(ic1.toString()).contains("InstantiationCommand(");
-        assertEquals(false, ic1.hashCode() == 0);
-        assertEquals(false, ic1.equals(ic0));
-        assertEquals(false, ic1.equals(null));
+        assertNotEquals(0, ic1.hashCode());
+        assertNotEquals(ic1, ic0);
+        assertNotEquals(null, ic1);
 
         assertNotEquals(ic1, ic0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.java
index 4cf7b8af0..d00d98ae0 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatisticsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,11 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Instant;
 import java.util.UUID;
@@ -147,8 +148,8 @@ class JpaAcElementStatisticsTest {
 
         assertThat(aces0.toString()).contains("JpaAcElementStatistics(");
         assertThat(aces0.hashCode()).isNotZero();
-        assertEquals(true, aces0.equals(aces0));
-        assertEquals(false, aces0.equals(null));
+        assertEquals(aces0, aces0);
+        assertNotEquals(null, aces0);
 
 
         JpaAcElementStatistics aces11 = new JpaAcElementStatistics();
@@ -156,9 +157,9 @@ class JpaAcElementStatisticsTest {
         aces11.setState(AutomationCompositionState.UNINITIALISED);
 
         assertThat(aces11.toString()).contains("JpaAcElementStatistics(");
-        assertEquals(false, aces11.hashCode() == 0);
-        assertEquals(false, aces11.equals(aces0));
-        assertEquals(false, aces11.equals(null));
+        assertNotEquals(0, aces11.hashCode());
+        assertNotEquals(aces11, aces0);
+        assertNotEquals(null, aces11);
 
         assertNotEquals(aces11, aces0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java
index f4257bdd2..20030e91e 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElementTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.UUID;
@@ -208,9 +208,8 @@ class JpaAutomationCompositionElementTest {
         JpaAutomationCompositionElement testJpaAutomationCompositionElement =
             createJpaAutomationCompositionElementInstance();
 
-        assertThatThrownBy(() -> {
-            testJpaAutomationCompositionElement.validate(null);
-        }).hasMessageMatching("fieldName is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaAutomationCompositionElement.validate(null))
+            .hasMessageMatching("fieldName is marked .*ull but is null");
 
         assertTrue(testJpaAutomationCompositionElement.validate("").isValid());
     }
@@ -271,8 +270,8 @@ class JpaAutomationCompositionElementTest {
 
         assertThat(ace0.toString()).contains("JpaAutomationCompositionElement(");
         assertThat(ace0.hashCode()).isNotZero();
-        assertEquals(true, ace0.equals(ace0));
-        assertEquals(false, ace0.equals(null));
+        assertEquals(ace0, ace0);
+        assertNotEquals(null, ace0);
 
         JpaAutomationCompositionElement ace1 = new JpaAutomationCompositionElement();
 
@@ -283,9 +282,9 @@ class JpaAutomationCompositionElementTest {
         ace1.setParticipantId(new PfConceptKey("participant", "0.0.1"));
 
         assertThat(ace1.toString()).contains("AutomationCompositionElement(");
-        assertEquals(false, ace1.hashCode() == 0);
-        assertEquals(false, ace1.equals(ace0));
-        assertEquals(false, ace1.equals(null));
+        assertNotEquals(0, ace1.hashCode());
+        assertNotEquals(ace1, ace0);
+        assertNotEquals(null, ace1);
 
         assertNotEquals(ace1, ace0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
index a016d1202..4dea5bd13 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,12 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.LinkedHashMap;
@@ -196,7 +197,7 @@ class JpaAutomationCompositionTest {
             new JpaAutomationComposition(automationCompositionsWithElements.getAutomationCompositionList().get(0));
         assertEquals(4, jpaAutomationCompositionWithElements.getElements().size());
         assertEquals(18, jpaAutomationCompositionWithElements.getKeys().size());
-        assertThatCode(() -> jpaAutomationCompositionWithElements.clean()).doesNotThrowAnyException();
+        assertThatCode(jpaAutomationCompositionWithElements::clean).doesNotThrowAnyException();
 
         assertEquals(automationCompositionsWithElements.getAutomationCompositionList().get(0),
             jpaAutomationCompositionWithElements.toAuthorative());
@@ -206,9 +207,8 @@ class JpaAutomationCompositionTest {
     void testJpaAutomationCompositionValidation() {
         JpaAutomationComposition testJpaAutomationComposition = createJpaAutomationCompositionInstance();
 
-        assertThatThrownBy(() -> {
-            testJpaAutomationComposition.validate(null);
-        }).hasMessageMatching("fieldName is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaAutomationComposition.validate(null))
+            .hasMessageMatching("fieldName is marked .*ull but is null");
 
         assertTrue(testJpaAutomationComposition.validate("").isValid());
     }
@@ -264,8 +264,8 @@ class JpaAutomationCompositionTest {
 
         assertThat(ac0.toString()).contains("JpaAutomationComposition(");
         assertThat(ac0.hashCode()).isNotZero();
-        assertEquals(true, ac0.equals(ac0));
-        assertEquals(false, ac0.equals(null));
+        assertEquals(ac0, ac0);
+        assertNotEquals(null, ac0);
 
         JpaAutomationComposition ac1 = new JpaAutomationComposition();
 
@@ -276,9 +276,9 @@ class JpaAutomationCompositionTest {
         ac1.setState(AutomationCompositionState.UNINITIALISED);
 
         assertThat(ac1.toString()).contains("AutomationComposition(");
-        assertEquals(false, ac1.hashCode() == 0);
-        assertEquals(false, ac1.equals(ac0));
-        assertEquals(false, ac1.equals(null));
+        assertNotEquals(0, ac1.hashCode());
+        assertNotEquals(ac1, ac0);
+        assertNotEquals(null, ac1);
 
         assertNotEquals(ac1, ac0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.java
index 284d13374..921f9b2b0 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatisticsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Instant;
 import org.junit.jupiter.api.Test;
@@ -151,18 +151,17 @@ class JpaParticipantStatisticsTest {
 
         assertThat(ps0.toString()).contains("JpaParticipantStatistics(");
         assertThat(ps0.hashCode()).isNotZero();
-        assertEquals(true, ps0.equals(ps0));
-        assertEquals(false, ps0.equals(null));
-
+        assertEquals(ps0, ps0);
+        assertNotEquals(null, ps0);
 
         JpaParticipantStatistics ps1 = new JpaParticipantStatistics();
 
         ps1.setState(ParticipantState.UNKNOWN);
 
         assertThat(ps1.toString()).contains("JpaParticipantStatistics(");
-        assertEquals(false, ps1.hashCode() == 0);
-        assertEquals(false, ps1.equals(ps0));
-        assertEquals(false, ps1.equals(null));
+        assertNotEquals(0, ps1.hashCode());
+        assertNotEquals(ps1, ps0);
+        assertNotEquals(null, ps1);
 
         assertNotEquals(ps1, ps0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java
index 776aafa2e..27ed738e1 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,11 @@ package org.onap.policy.clamp.models.acm.persistence.concepts;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 import org.onap.policy.clamp.models.acm.concepts.Participant;
@@ -35,7 +36,7 @@ import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 
 /**
- * Test the {@link JpaParticiant} class.
+ * Test the {@link JpaParticipant} class.
  */
 class JpaParticipantTest {
 
@@ -43,78 +44,63 @@ class JpaParticipantTest {
 
     @Test
     void testJpaParticipantConstructor() {
-        assertThatThrownBy(() -> {
-            new JpaParticipant((JpaParticipant) null);
-        }).hasMessageMatching("copyConcept is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant((JpaParticipant) null))
+            .hasMessageMatching("copyConcept is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant((PfConceptKey) null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant((PfConceptKey) null)).hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, null, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, null, null, null)).hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, null, null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, ParticipantState.ACTIVE, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, null, ParticipantState.ACTIVE, null))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, null, ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(
+            () -> new JpaParticipant(null, null, ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), null, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), null, null))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE, null);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE, null))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching(NULL_KEY_ERROR);
+        assertThatThrownBy(() -> new JpaParticipant(null, new PfConceptKey(), ParticipantState.ACTIVE,
+            ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching(NULL_KEY_ERROR);
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, null, null);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, null, null))
+            .hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE, null);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE, null))
+            .hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching("definition is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), null, ParticipantState.ACTIVE,
+            ParticipantHealthStatus.HEALTHY)).hasMessageMatching("definition is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, null);
-        }).hasMessageMatching("participantState is marked .*ull but is null");
+        assertThatThrownBy(() -> new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, null))
+            .hasMessageMatching("participantState is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY);
-        }).hasMessageMatching("participantState is marked .*ull but is null");
+        assertThatThrownBy(
+            () -> new JpaParticipant(new PfConceptKey(), new PfConceptKey(), null, ParticipantHealthStatus.HEALTHY))
+            .hasMessageMatching("participantState is marked .*ull but is null");
 
-        assertThatThrownBy(() -> {
-            new JpaParticipant(new PfConceptKey(), new PfConceptKey(), ParticipantState.ACTIVE, null);
-        }).hasMessageMatching("healthStatus is marked .*ull but is null");
+        assertThatThrownBy(
+            () -> new JpaParticipant(new PfConceptKey(), new PfConceptKey(), ParticipantState.ACTIVE, null))
+            .hasMessageMatching("healthStatus is marked .*ull but is null");
 
         assertNotNull(new JpaParticipant());
         assertNotNull(new JpaParticipant((new PfConceptKey())));
         assertNotNull(new JpaParticipant(new PfConceptKey(), new PfConceptKey(), ParticipantState.ACTIVE,
-                ParticipantHealthStatus.HEALTHY));
+            ParticipantHealthStatus.HEALTHY));
     }
 
     @Test
@@ -124,9 +110,8 @@ class JpaParticipantTest {
         Participant participant = createParticipantInstance();
         assertEquals(participant, testJpaParticipant.toAuthorative());
 
-        assertThatThrownBy(() -> {
-            testJpaParticipant.fromAuthorative(null);
-        }).hasMessageMatching("participant is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaParticipant.fromAuthorative(null))
+            .hasMessageMatching("participant is marked .*ull but is null");
 
         assertThatThrownBy(() -> new JpaParticipant((JpaParticipant) null)).isInstanceOf(NullPointerException.class);
 
@@ -144,7 +129,7 @@ class JpaParticipantTest {
         assertEquals("participant", testJpaParticipant.getKey().getName());
         assertEquals("participant", new JpaParticipant(createParticipantInstance()).getKey().getName());
         assertEquals("participant",
-                ((PfConceptKey) new JpaParticipant(createParticipantInstance()).getKeys().get(0)).getName());
+            ((PfConceptKey) new JpaParticipant(createParticipantInstance()).getKeys().get(0)).getName());
 
         testJpaParticipant.clean();
         assertEquals("participant", testJpaParticipant.getKey().getName());
@@ -161,9 +146,8 @@ class JpaParticipantTest {
     void testJpaParticipantValidation() {
         JpaParticipant testJpaParticipant = createJpaParticipantInstance();
 
-        assertThatThrownBy(() -> {
-            testJpaParticipant.validate(null);
-        }).hasMessageMatching("fieldName is marked .*ull but is null");
+        assertThatThrownBy(() -> testJpaParticipant.validate(null))
+            .hasMessageMatching("fieldName is marked .*ull but is null");
 
         assertTrue(testJpaParticipant.validate("").isValid());
     }
@@ -208,8 +192,8 @@ class JpaParticipantTest {
 
         assertThat(p0.toString()).contains("JpaParticipant(");
         assertThat(p0.hashCode()).isNotZero();
-        assertEquals(true, p0.equals(p0));
-        assertEquals(false, p0.equals(null));
+        assertEquals(p0, p0);
+        assertNotEquals(null, p0);
 
 
         JpaParticipant p1 = new JpaParticipant();
@@ -221,9 +205,9 @@ class JpaParticipantTest {
         p1.setParticipantState(ParticipantState.ACTIVE);
 
         assertThat(p1.toString()).contains("Participant(");
-        assertEquals(false, p1.hashCode() == 0);
-        assertEquals(false, p1.equals(p0));
-        assertEquals(false, p1.equals(null));
+        assertNotEquals(0, p1.hashCode());
+        assertNotEquals(p1, p0);
+        assertNotEquals(null, p1);
 
         assertNotEquals(p1, p0);
 
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.java
index 15d1d845d..7daf3fbcf 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProviderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
@@ -49,7 +49,7 @@ class AcElementStatisticsProviderTest {
 
     private AcElementStatisticsProvider acElementStatisticsProvider;
     private AcElementStatisticsList inputAcElementStats;
-    private String originalJson = ResourceUtils.getResourceAsString(AC_ELEMENT_STATS_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(AC_ELEMENT_STATS_JSON);
 
     /**
      * Set up test AcElement statistics provider.
@@ -82,9 +82,8 @@ class AcElementStatisticsProviderTest {
 
     @Test
     void testAcElementStatisticsCreate() throws Exception {
-        assertThatThrownBy(() -> {
-            acElementStatisticsProvider.createAcElementStatistics(null);
-        }).hasMessageMatching(LIST_IS_NULL);
+        assertThatThrownBy(() -> acElementStatisticsProvider.createAcElementStatistics(null))
+            .hasMessageMatching(LIST_IS_NULL);
 
         AcElementStatisticsList createdAcElementStats = new AcElementStatisticsList();
         createdAcElementStats.setAcElementStatistics(
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.java
index 0a367eed8..3228347e9 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProviderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -65,13 +65,13 @@ class AutomationCompositionProviderTest {
     private static final Coder CODER = new StandardCoder();
     private static final String AUTOMATION_COMPOSITION_JSON =
         "src/test/resources/providers/TestAutomationCompositions.json";
-    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/PMSubscriptionHandling.yaml";
+    private static final String TOSCA_TEMPLATE_YAML = "examples/acm/test-pm-subscription-handling.yaml";
 
     private static final YamlJsonTranslator yamlTranslator = new YamlJsonTranslator();
 
     private AutomationCompositions inputAutomationCompositions;
     private List<JpaAutomationComposition> inputAutomationCompositionsJpa;
-    private String originalJson = ResourceUtils.getResourceAsString(AUTOMATION_COMPOSITION_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(AUTOMATION_COMPOSITION_JSON);
 
     @BeforeEach
     void beforeSetupDao() throws Exception {
@@ -87,9 +87,8 @@ class AutomationCompositionProviderTest {
         var automationCompositionProvider = new AutomationCompositionProvider(automationCompositionRepository,
             mock(ToscaNodeTemplateRepository.class), mock(ToscaNodeTemplatesRepository.class));
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.saveAutomationCompositions(null);
-        }).hasMessageMatching(LIST_IS_NULL);
+        assertThatThrownBy(() -> automationCompositionProvider.saveAutomationCompositions(null))
+            .hasMessageMatching(LIST_IS_NULL);
 
         when(automationCompositionRepository.saveAll(inputAutomationCompositionsJpa))
             .thenReturn(inputAutomationCompositionsJpa);
@@ -102,10 +101,9 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.saveAll(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider
-                .saveAutomationCompositions(inputAutomationCompositions.getAutomationCompositionList());
-        }).hasMessageMatching("Error in save AutomationCompositions");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .saveAutomationCompositions(inputAutomationCompositions.getAutomationCompositionList()))
+            .hasMessageMatching("Error in save AutomationCompositions");
     }
 
     @Test
@@ -114,9 +112,8 @@ class AutomationCompositionProviderTest {
         var automationCompositionProvider = new AutomationCompositionProvider(automationCompositionRepository,
             mock(ToscaNodeTemplateRepository.class), mock(ToscaNodeTemplatesRepository.class));
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.saveAutomationComposition(null);
-        }).hasMessageMatching(OBJECT_IS_NULL);
+        assertThatThrownBy(() -> automationCompositionProvider.saveAutomationComposition(null))
+            .hasMessageMatching(OBJECT_IS_NULL);
 
         when(automationCompositionRepository.save(inputAutomationCompositionsJpa.get(0)))
             .thenReturn(inputAutomationCompositionsJpa.get(0));
@@ -128,10 +125,9 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.save(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider
-                .saveAutomationComposition(inputAutomationCompositions.getAutomationCompositionList().get(0));
-        }).hasMessageMatching("Error in save automationComposition");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .saveAutomationComposition(inputAutomationCompositions.getAutomationCompositionList().get(0)))
+            .hasMessageMatching("Error in save automationComposition");
     }
 
     @Test
@@ -167,7 +163,8 @@ class AutomationCompositionProviderTest {
         assertEquals(1, automationCompositionProvider.getAutomationCompositions(name, version).size());
 
         var ac = automationCompositionProvider
-            .findAutomationComposition(new ToscaConceptIdentifier(ID_NAME, ID_VERSION)).get();
+            .findAutomationComposition(new ToscaConceptIdentifier(ID_NAME, ID_VERSION))
+            .orElse(new AutomationComposition());
         assertEquals(inputAutomationCompositions.getAutomationCompositionList().get(1), ac);
 
         ac = automationCompositionProvider.getAutomationComposition(new ToscaConceptIdentifier(ID_NAME, ID_VERSION));
@@ -175,12 +172,12 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.getById(any())).thenThrow(EntityNotFoundException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider
-                .getAutomationComposition(new ToscaConceptIdentifier(ID_NAME_NOT_EXTST, ID_VERSION));
-        }).hasMessageMatching("AutomationComposition not found");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .getAutomationComposition(new ToscaConceptIdentifier(ID_NAME_NOT_EXTST, ID_VERSION)))
+            .hasMessageMatching("AutomationComposition not found");
 
-        ac = automationCompositionProvider.findAutomationComposition(ID_NAME, ID_VERSION).get();
+        ac = automationCompositionProvider.findAutomationComposition(ID_NAME, ID_VERSION)
+            .orElse(new AutomationComposition());
         assertEquals(inputAutomationCompositions.getAutomationCompositionList().get(1), ac);
 
         assertThat(automationCompositionProvider
@@ -188,9 +185,8 @@ class AutomationCompositionProviderTest {
 
         when(automationCompositionRepository.findById(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.findAutomationComposition(ID_NAME_NOT_VALID, ID_VERSION);
-        }).hasMessageMatching("Not valid parameter");
+        assertThatThrownBy(() -> automationCompositionProvider.findAutomationComposition(ID_NAME_NOT_VALID, ID_VERSION))
+            .hasMessageMatching("Not valid parameter");
     }
 
     @Test
@@ -199,9 +195,9 @@ class AutomationCompositionProviderTest {
         var automationCompositionProvider = new AutomationCompositionProvider(automationCompositionRepository,
             mock(ToscaNodeTemplateRepository.class), mock(ToscaNodeTemplatesRepository.class));
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.deleteAutomationComposition(ID_NAME_NOT_EXTST, ID_VERSION);
-        }).hasMessageMatching(".*.failed, automation composition does not exist");
+        assertThatThrownBy(() -> automationCompositionProvider
+            .deleteAutomationComposition(ID_NAME_NOT_EXTST, ID_VERSION))
+            .hasMessageMatching(".*.failed, automation composition does not exist");
 
         var automationComposition = inputAutomationCompositions.getAutomationCompositionList().get(0);
         var name = automationComposition.getName();
@@ -227,7 +223,7 @@ class AutomationCompositionProviderTest {
     }
 
     @Test
-    void testSaveAndDeleteInstanceProperties() throws Exception {
+    void testSaveAndDeleteInstanceProperties() {
         var toscaNodeTemplatesRepository = mock(ToscaNodeTemplatesRepository.class);
         var toscaNodeTemplateRepository = mock(ToscaNodeTemplateRepository.class);
         var automationCompositionProvider = new AutomationCompositionProvider(
@@ -253,7 +249,7 @@ class AutomationCompositionProviderTest {
     }
 
     @Test
-    void testGetNodeTemplates() throws Exception {
+    void testGetNodeTemplates() {
         var toscaNodeTemplateRepository = mock(ToscaNodeTemplateRepository.class);
         var automationCompositionProvider =
             new AutomationCompositionProvider(mock(AutomationCompositionRepository.class), toscaNodeTemplateRepository,
@@ -288,18 +284,17 @@ class AutomationCompositionProviderTest {
         assertNotNull(listNodes);
         assertThat(listNodes).hasSize(1);
 
-        assertThatThrownBy(() -> {
-            automationCompositionProvider.getFilteredNodeTemplates(null);
-        }).hasMessageMatching("filter is marked non-null but is null");
+        assertThatThrownBy(() -> automationCompositionProvider.getFilteredNodeTemplates(null))
+            .hasMessageMatching("filter is marked non-null but is null");
     }
 
     private static ToscaServiceTemplate testAutomationCompositionRead() {
-        return testAutomationCompositionYamlSerialization(TOSCA_TEMPLATE_YAML);
+        return testAutomationCompositionYamlSerialization();
     }
 
-    private static ToscaServiceTemplate testAutomationCompositionYamlSerialization(
-        String automationCompositionFilePath) {
-        var automationCompositionString = ResourceUtils.getResourceAsString(automationCompositionFilePath);
+    private static ToscaServiceTemplate testAutomationCompositionYamlSerialization() {
+        var automationCompositionString = ResourceUtils.getResourceAsString(
+            AutomationCompositionProviderTest.TOSCA_TEMPLATE_YAML);
         return yamlTranslator.fromYaml(automationCompositionString, ToscaServiceTemplate.class);
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
index f537e2cd7..c7355f002 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -48,9 +48,9 @@ class ParticipantProviderTest {
     private static final String PARTICIPANT_JSON = "src/test/resources/providers/TestParticipant.json";
     private static final String LIST_IS_NULL = ".*. is marked .*ull but is null";
 
-    private List<Participant> inputParticipants = new ArrayList<>();
+    private final List<Participant> inputParticipants = new ArrayList<>();
     private List<JpaParticipant> jpaParticipantList;
-    private String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_JSON);
 
     @BeforeEach
     void beforeSetupDao() throws Exception {
@@ -67,9 +67,8 @@ class ParticipantProviderTest {
         }
         var participantProvider = new ParticipantProvider(participantRepository);
 
-        assertThatThrownBy(() -> {
-            participantProvider.saveParticipant(null);
-        }).hasMessageMatching(LIST_IS_NULL);
+        assertThatThrownBy(() -> participantProvider.saveParticipant(null))
+            .hasMessageMatching(LIST_IS_NULL);
 
         when(participantRepository.save(any())).thenReturn(jpaParticipantList.get(0));
 
@@ -78,9 +77,8 @@ class ParticipantProviderTest {
 
         when(participantRepository.save(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            participantProvider.saveParticipant(inputParticipants.get(0));
-        }).hasMessageMatching("Error in save Participant");
+        assertThatThrownBy(() -> participantProvider.saveParticipant(inputParticipants.get(0)))
+            .hasMessageMatching("Error in save Participant");
     }
 
     @Test
@@ -107,15 +105,13 @@ class ParticipantProviderTest {
 
         when(participantRepository.findById(any())).thenThrow(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> {
-            participantProvider.findParticipant("notValid", "notValid");
-        }).hasMessageMatching("Error in find Participant");
+        assertThatThrownBy(() -> participantProvider.findParticipant("notValid", "notValid"))
+            .hasMessageMatching("Error in find Participant");
 
-        assertThatThrownBy(() -> {
-            participantProvider.getFilteredParticipants(null);
-        }).hasMessageMatching("filter is marked .*ull but is null");
+        assertThatThrownBy(() -> participantProvider.getFilteredParticipants(null))
+            .hasMessageMatching("filter is marked .*ull but is null");
 
-        when(participantRepository.getFiltered(eq(JpaParticipant.class), eq(null), eq(null)))
+        when(participantRepository.getFiltered((JpaParticipant.class), (null), (null)))
                 .thenReturn(jpaParticipantList);
 
         final ToscaTypedEntityFilter<Participant> filter = ToscaTypedEntityFilter.<Participant>builder()
@@ -129,9 +125,8 @@ class ParticipantProviderTest {
         var participantRepository = mock(ParticipantRepository.class);
         var participantProvider = new ParticipantProvider(participantRepository);
 
-        assertThatThrownBy(() -> {
-            participantProvider.deleteParticipant("Invalid_name", "1.0.1");
-        }).hasMessageMatching(".*.failed, participant does not exist");
+        assertThatThrownBy(() -> participantProvider.deleteParticipant("Invalid_name", "1.0.1"))
+            .hasMessageMatching(".*.failed, participant does not exist");
 
         String name = inputParticipants.get(0).getName();
         String version = inputParticipants.get(0).getVersion();
@@ -142,8 +137,7 @@ class ParticipantProviderTest {
         assertEquals(inputParticipants.get(0), deletedParticipant);
 
         when(participantRepository.findById(any())).thenThrow(IllegalArgumentException.class);
-        assertThatThrownBy(() -> {
-            participantProvider.deleteParticipant(name, version);
-        }).hasMessageMatching("Error in delete Participant");
+        assertThatThrownBy(() -> participantProvider.deleteParticipant(name, version))
+            .hasMessageMatching("Error in delete Participant");
     }
 }
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.java
index 3c6b1eb83..839c14e83 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProviderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ package org.onap.policy.clamp.models.acm.persistence.provider;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
@@ -50,7 +50,7 @@ class ParticipantStatisticsProviderTest {
 
     private ParticipantStatisticsProvider participantStatisticsProvider;
     private ParticipantStatisticsList inputParticipantStatistics;
-    private String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_STATS_JSON);
+    private final String originalJson = ResourceUtils.getResourceAsString(PARTICIPANT_STATS_JSON);
 
     @BeforeEach
     void beforeSetupDao() throws Exception {
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.java
index 4d998717e..f5daa1585 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ServiceTemplateProviderTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,8 +43,7 @@ import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
 
 class ServiceTemplateProviderTest {
 
-    private static final String TOSCA_SERVICE_TEMPLATE_YAML =
-            "src/test/resources/providers/tosca-for-smoke-testing.yaml";
+    private static final String TOSCA_SERVICE_TEMPLATE_YAML = "clamp/acm/pmsh/funtional-pmsh-usecase.yaml";
 
     private static final StandardYamlCoder YAML_TRANSLATOR = new StandardYamlCoder();
 
@@ -62,7 +61,7 @@ class ServiceTemplateProviderTest {
 
         var result = serviceTemplateProvider.getCommonOrInstancePropertiesFromNodeTypes(true, inputServiceTemplate);
         assertNotNull(result);
-        assertThat(result).hasSize(8);
+        assertThat(result).hasSize(6);
     }
 
     @Test
@@ -71,13 +70,13 @@ class ServiceTemplateProviderTest {
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
 
         var commonOrInstanceNodeTypeProps =
-                serviceTemplateProvider.getCommonOrInstancePropertiesFromNodeTypes(true, inputServiceTemplate);
+            serviceTemplateProvider.getCommonOrInstancePropertiesFromNodeTypes(true, inputServiceTemplate);
 
         var result = serviceTemplateProvider.getDerivedCommonOrInstanceNodeTemplates(
-                inputServiceTemplate.getToscaTopologyTemplate().getNodeTemplates(), commonOrInstanceNodeTypeProps);
+            inputServiceTemplate.getToscaTopologyTemplate().getNodeTemplates(), commonOrInstanceNodeTypeProps);
 
         assertNotNull(result);
-        assertThat(result).hasSize(8);
+        assertThat(result).hasSize(5);
     }
 
     @Test
@@ -86,7 +85,7 @@ class ServiceTemplateProviderTest {
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
 
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         when(serviceTemplateRepository.save(jpaServiceTemplate)).thenReturn(jpaServiceTemplate);
 
         var result = serviceTemplateProvider.createServiceTemplate(inputServiceTemplate);
@@ -97,41 +96,56 @@ class ServiceTemplateProviderTest {
     @Test
     void testDeleteServiceTemplate() throws PfModelException {
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository
-                .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
-                        .thenReturn(Optional.of(jpaServiceTemplate));
+            .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
+            .thenReturn(Optional.of(jpaServiceTemplate));
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         var result = serviceTemplateProvider.deleteServiceTemplate(inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion());
+            inputServiceTemplate.getVersion());
 
         assertThat(result).isEqualTo(jpaServiceTemplate.toAuthorative());
     }
 
     @Test
-    void testGetServiceTemplateListEmpty() throws PfModelException {
+    void testDeleteServiceTemplateEmpty() throws PfModelException {
+        var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
+            "toscaServiceTemplate");
+        var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
+        when(serviceTemplateRepository
+            .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
+            .thenReturn(Optional.empty());
+
+        var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
+        assertThatThrownBy(() -> serviceTemplateProvider.deleteServiceTemplate(inputServiceTemplate.getName(),
+            inputServiceTemplate.getVersion()))
+            .hasMessage("delete of serviceTemplate \"NULL:0.0.0\" failed, serviceTemplate does not exist");
+    }
+
+    @Test
+    void testGetServiceTemplateListEmpty() {
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository.findById(any())).thenReturn(Optional.empty());
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         assertThatThrownBy(() -> serviceTemplateProvider.getToscaServiceTemplate("Name", "1.0.0"))
-                .hasMessage("Automation composition definitions not found");
+            .hasMessage("Automation composition definitions not found");
     }
 
     @Test
     void testGetServiceTemplateList() throws PfModelException {
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository
-                .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
-                        .thenReturn(Optional.of(jpaServiceTemplate));
+            .findById(new PfConceptKey(inputServiceTemplate.getName(), inputServiceTemplate.getVersion())))
+            .thenReturn(Optional.of(jpaServiceTemplate));
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         var result = serviceTemplateProvider.getToscaServiceTemplate(inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion());
+            inputServiceTemplate.getVersion());
 
         assertThat(result).isEqualTo(jpaServiceTemplate.toAuthorative());
     }
@@ -139,14 +153,14 @@ class ServiceTemplateProviderTest {
     @Test
     void testGetServiceTemplate() throws PfModelException {
         var jpaServiceTemplate = ProviderUtils.getJpaAndValidate(inputServiceTemplate, JpaToscaServiceTemplate::new,
-                "toscaServiceTemplate");
+            "toscaServiceTemplate");
         var serviceTemplateRepository = mock(ToscaServiceTemplateRepository.class);
         when(serviceTemplateRepository.getFiltered(JpaToscaServiceTemplate.class, inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion())).thenReturn(List.of(jpaServiceTemplate));
+            inputServiceTemplate.getVersion())).thenReturn(List.of(jpaServiceTemplate));
 
         var serviceTemplateProvider = new ServiceTemplateProvider(serviceTemplateRepository);
         var result = serviceTemplateProvider.getServiceTemplateList(inputServiceTemplate.getName(),
-                inputServiceTemplate.getVersion());
+            inputServiceTemplate.getVersion());
 
         assertThat(result).hasSize(1);
         assertThat(result.get(0)).isEqualTo(jpaServiceTemplate.toAuthorative());
diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
index a5434240a..0e68593c2 100644
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 package org.onap.policy.clamp.models.acm.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -43,8 +44,8 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
 
 class AcmUtilsTest {
 
-    private ToscaConceptIdentifier id = new ToscaConceptIdentifier("id", "1.0.0");
-    private ToscaConceptIdentifier idNode =
+    private final ToscaConceptIdentifier id = new ToscaConceptIdentifier("id", "1.0.0");
+    private final ToscaConceptIdentifier idNode =
         new ToscaConceptIdentifier("org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant", "0.0.0");
 
     @Test
@@ -89,6 +90,16 @@ class AcmUtilsTest {
             .getAcElementDefinitionId());
     }
 
+    @Test
+    void testSetServiceTemplatePolicyInfoWithNullInfo() {
+        var toscaServiceTemplate = getDummyToscaServiceTemplate();
+        toscaServiceTemplate.setPolicyTypes(null);
+        toscaServiceTemplate.getToscaTopologyTemplate().setPolicies(null);
+        AutomationCompositionElement acElement = new AutomationCompositionElement();
+        AcmUtils.setServiceTemplatePolicyInfo(new AutomationCompositionElement(), toscaServiceTemplate);
+        assertNull(acElement.getToscaServiceTemplateFragment());
+    }
+
     private ToscaServiceTemplate getDummyToscaServiceTemplate() {
         var toscaServiceTemplate = new ToscaServiceTemplate();
         var policyTypes = getDummyPolicyTypesMap();
diff --git a/models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
index c8796ac49..c8796ac49 100644
--- a/models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
+++ b/models/src/test/resources/examples/acm/test-pm-subscription-handling.yaml
diff --git a/models/src/test/resources/providers/tosca-for-smoke-testing.yaml b/models/src/test/resources/providers/tosca-for-smoke-testing.yaml
deleted file mode 100644
index f69755e2b..000000000
--- a/models/src/test/resources/providers/tosca-for-smoke-testing.yaml
+++ /dev/null
@@ -1,966 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_3
-data_types:
-  onap.datatypes.ToscaConceptIdentifier:
-    derived_from: tosca.datatypes.Root
-    properties:
-      name:
-        type: string
-        required: true
-      version:
-        type: string
-        required: true
-  onap.datatype.controlloop.Target:
-    derived_from: tosca.datatypes.Root
-    description: Definition for a entity in A&AI to perform a control loop operation on
-    properties:
-      targetType:
-        type: string
-        description: Category for the target type
-        required: true
-        constraints:
-          - valid_values:
-              - VNF
-              - VM
-              - VFMODULE
-              - PNF
-      entityIds:
-        type: map
-        description: |
-          Map of values that identify the resource. If none are provided, it is assumed that the
-          entity that generated the ONSET event will be the target.
-        required: false
-        metadata:
-          clamp_possible_values: ClampExecution:CSAR_RESOURCES
-        entry_schema:
-          type: string
-  onap.datatype.controlloop.Actor:
-    derived_from: tosca.datatypes.Root
-    description: An actor/operation/target definition
-    properties:
-      actor:
-        type: string
-        description: The actor performing the operation.
-        required: true
-        metadata:
-          clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor
-      operation:
-        type: string
-        description: The operation the actor is performing.
-        metadata:
-          clamp_possible_values: Dictionary:DefaultOperations,ClampExecution:CDS/operation
-        required: true
-      target:
-        type: onap.datatype.controlloop.Target
-        description: The resource the operation should be performed on.
-        required: true
-      payload:
-        type: map
-        description: Name/value pairs of payload information passed by Policy to the actor
-        required: false
-        metadata:
-          clamp_possible_values: ClampExecution:CDS/payload
-        entry_schema:
-          type: string
-  onap.datatype.controlloop.Operation:
-    derived_from: tosca.datatypes.Root
-    description: An operation supported by an actor
-    properties:
-      id:
-        type: string
-        description: Unique identifier for the operation
-        required: true
-      description:
-        type: string
-        description: A user-friendly description of the intent for the operation
-        required: false
-      operation:
-        type: onap.datatype.controlloop.Actor
-        description: The definition of the operation to be performed.
-        required: true
-      timeout:
-        type: integer
-        description: The amount of time for the actor to perform the operation.
-        required: true
-      retries:
-        type: integer
-        description: The number of retries the actor should attempt to perform the operation.
-        required: true
-        default: 0
-      success:
-        type: string
-        description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
-        required: false
-        default: final_success
-      failure:
-        type: string
-        description: Points to the operation to invoke on Actor operation failure.
-        required: false
-        default: final_failure
-      failure_timeout:
-        type: string
-        description: Points to the operation to invoke when the time out for the operation occurs.
-        required: false
-        default: final_failure_timeout
-      failure_retries:
-        type: string
-        description: Points to the operation to invoke when the current operation has exceeded its max retries.
-        required: false
-        default: final_failure_retries
-      failure_exception:
-        type: string
-        description: Points to the operation to invoke when the current operation causes an exception.
-        required: false
-        default: final_failure_exception
-      failure_guard:
-        type: string
-        description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
-        required: false
-        default: final_failure_guard
-  onap.datatypes.monitoring.managedObjectDNsBasic:
-    constraints: []
-    properties:
-      DN:
-        name: DN
-        type: string
-        typeVersion: 0.0.0
-        description: Managed object distinguished name
-        required: true
-        constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.managedObjectDNsBasic
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.managedObjectDNsBasics:
-    constraints: []
-    properties:
-      managedObjectDNsBasic:
-        name: managedObjectDNsBasic
-        type: map
-        typeVersion: 0.0.0
-        description: Managed object distinguished name object
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.managedObjectDNsBasic
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.managedObjectDNsBasics
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementGroup:
-    constraints: []
-    properties:
-      measurementTypes:
-        name: measurementTypes
-        type: list
-        typeVersion: 0.0.0
-        description: List of measurement types
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementTypes
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      managedObjectDNsBasic:
-        name: managedObjectDNsBasic
-        type: list
-        typeVersion: 0.0.0
-        description: List of managed object distinguished names
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.managedObjectDNsBasics
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementGroup
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementGroups:
-    constraints: []
-    properties:
-      measurementGroup:
-        name: measurementGroup
-        type: map
-        typeVersion: 0.0.0
-        description: Measurement Group
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementGroup
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementGroups
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementType:
-    constraints: []
-    properties:
-      measurementType:
-        name: measurementType
-        type: string
-        typeVersion: 0.0.0
-        description: Measurement type
-        required: true
-        constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementType
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.measurementTypes:
-    constraints: []
-    properties:
-      measurementType:
-        name: measurementType
-        type: map
-        typeVersion: 0.0.0
-        description: Measurement type object
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementType
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.measurementTypes
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.nfFilter:
-    constraints: []
-    properties:
-      modelNames:
-        name: modelNames
-        type: list
-        typeVersion: 0.0.0
-        description: List of model names
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      modelInvariantIDs:
-        name: modelInvariantIDs
-        type: list
-        typeVersion: 0.0.0
-        description: List of model invariant IDs
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      modelVersionIDs:
-        name: modelVersionIDs
-        type: list
-        typeVersion: 0.0.0
-        description: List of model version IDs
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      nfNames:
-        name: nfNames
-        type: list
-        typeVersion: 0.0.0
-        description: List of network functions
-        required: true
-        constraints: []
-        entry_schema:
-          type: string
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.nfFilter
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  onap.datatypes.monitoring.subscription:
-    constraints: []
-    properties:
-      measurementGroups:
-        name: measurementGroups
-        type: list
-        typeVersion: 0.0.0
-        description: Measurement Groups
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.measurementGroups
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-      fileBasedGP:
-        name: fileBasedGP
-        type: integer
-        typeVersion: 0.0.0
-        description: File based granularity period
-        required: true
-        constraints: []
-        metadata: {}
-      fileLocation:
-        name: fileLocation
-        type: string
-        typeVersion: 0.0.0
-        description: ROP file location
-        required: true
-        constraints: []
-        metadata: {}
-      subscriptionName:
-        name: subscriptionName
-        type: string
-        typeVersion: 0.0.0
-        description: Name of the subscription
-        required: true
-        constraints: []
-        metadata: {}
-      administrativeState:
-        name: administrativeState
-        type: string
-        typeVersion: 0.0.0
-        description: State of the subscription
-        required: true
-        constraints:
-          - valid_values:
-              - LOCKED
-              - UNLOCKED
-        metadata: {}
-      nfFilter:
-        name: nfFilter
-        type: map
-        typeVersion: 0.0.0
-        description: Network function filter
-        required: true
-        constraints: []
-        entry_schema:
-          type: onap.datatypes.monitoring.nfFilter
-          typeVersion: 0.0.0
-          constraints: []
-        metadata: {}
-    name: onap.datatypes.monitoring.subscription
-    version: 0.0.0
-    derived_from: tosca.datatypes.Root
-    metadata: {}
-  org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest:
-    version: 1.0.0
-    derived_from: tosca.datatypes.Root
-    properties:
-      restRequestId:
-        type:  onap.datatypes.ToscaConceptIdentifier
-        typeVersion: 1.0.0
-        required: true
-        description: The name and version of a REST request to be sent to a REST endpoint
-      httpMethod:
-        type: string
-        required: true
-        constraints:
-          - valid_values: [POST, PUT, GET, DELETE]
-        description: The REST method to use
-      path:
-        type: string
-        required: true
-        description: The path of the REST request relative to the base URL
-      body:
-        type: string
-        required: false
-        description: The body of the REST request for PUT and POST requests
-      expectedResponse:
-        type: integer
-        required: true
-        constraints: []
-        description: THe expected HTTP status code for the REST request
-    org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity:
-      version: 1.0.0
-      derived_from: tosca.datatypes.Root
-      properties:
-        configurationEntityId:
-          type:  onap.datatypes.ToscaConceptIdentifier
-          typeVersion: 1.0.0
-          required: true
-          description: The name and version of a Configuration Entity to be handled by the HTTP Control Loop Element
-        restSequence:
-          type: list
-          entry_schema:
-            type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest
-            typeVersion: 1.0.0
-          description: A sequence of REST commands to send to the REST endpoint
-policy_types:
-  onap.policies.Monitoring:
-    derived_from: tosca.policies.Root
-    description: a base policy type for all policies that govern monitoring provisioning
-    version: 1.0.0
-    name: onap.policies.Monitoring
-  onap.policies.Sirisha:
-    derived_from: tosca.policies.Root
-    description: a base policy type for all policies that govern monitoring provisioning
-    version: 1.0.0
-    name: onap.policies.Sirisha
-  onap.policies.monitoring.dcae-pm-subscription-handler:
-    properties:
-      pmsh_policy:
-        name: pmsh_policy
-        type: onap.datatypes.monitoring.subscription
-        typeVersion: 0.0.0
-        description: PMSH Policy JSON
-        required: false
-        constraints: []
-        metadata: {}
-    name: onap.policies.monitoring.dcae-pm-subscription-handler
-    version: 1.0.0
-    derived_from: onap.policies.Monitoring
-    metadata: {}
-  onap.policies.controlloop.operational.Common:
-    derived_from: tosca.policies.Root
-    version: 1.0.0
-    name: onap.policies.controlloop.operational.Common
-    description: |
-      Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant
-      Policy Types. This does NOT support the legacy Policy YAML policy type.
-    properties:
-      id:
-        type: string
-        description: The unique control loop id.
-        required: true
-      timeout:
-        type: integer
-        description: |
-          Overall timeout for executing all the operations. This timeout should equal or exceed the total
-          timeout for each operation listed.
-        required: true
-      abatement:
-        type: boolean
-        description: Whether an abatement event message will be expected for the control loop from DCAE.
-        required: true
-        default: false
-      trigger:
-        type: string
-        description: Initial operation to execute upon receiving an Onset event message for the Control Loop.
-        required: true
-      operations:
-        type: list
-        description: List of operations to be performed when Control Loop is triggered.
-        required: true
-        entry_schema:
-          type: onap.datatype.controlloop.Operation
-  onap.policies.controlloop.operational.common.Apex:
-    derived_from: onap.policies.controlloop.operational.Common
-    type_version: 1.0.0
-    version: 1.0.0
-    name: onap.policies.controlloop.operational.common.Apex
-    description: Operational policies for Apex PDP
-    properties:
-      engineServiceParameters:
-        type: string
-        description: The engine parameters like name, instanceCount, policy implementation, parameters etc.
-        required: true
-      eventInputParameters:
-        type: string
-        description: The event input parameters.
-        required: true
-      eventOutputParameters:
-        type: string
-        description: The event output parameters.
-        required: true
-      javaProperties:
-        type: string
-        description: Name/value pairs of properties to be set for APEX if needed.
-        required: false
-node_types:
-  org.onap.policy.clamp.controlloop.Participant:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        requred: false
-  org.onap.policy.clamp.controlloop.ControlLoopElement:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-        metadata:
-          common: true
-        description: Specifies the organization that provides the control loop element
-      participant_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-        metadata:
-          common: true
-      participantType:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        metadata:
-          common: true
-        description: The identity of the participant type that hosts this type of Control Loop Element
-      startPhase:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        metadata:
-          common: true
-        description: A value indicating the start phase in which this control loop element will be started, the
-          first start phase is zero. Control Loop Elements are started in their start_phase order and stopped
-          in reverse start phase order. Control Loop Elements with the same start phase are started and
-          stopped simultaneously
-      uninitializedToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from uninitialized to passive
-      passiveToRunningTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to running
-      runningToPassiveTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from running to passive
-      passiveToUninitializedTimeout:
-        type: integer
-        required: false
-        constraints:
-          - greater_or_equal: 0
-        default: 60
-        metadata:
-          common: true
-        description: The maximum time in seconds to wait for a state chage from passive to uninitialized
-  org.onap.policy.clamp.controlloop.ControlLoop:
-    version: 1.0.1
-    derived_from: tosca.nodetypes.Root
-    properties:
-      provider:
-        type: string
-        required: false
-        metadata:
-          common: true
-        description: Specifies the organization that provides the control loop element
-      elements:
-        type: list
-        required: true
-        metadata:
-          common: true
-        entry_schema:
-          type: onap.datatypes.ToscaConceptIdentifier
-        description: Specifies a list of control loop element definitions that make up this control loop definition
-  org.onap.policy.clamp.controlloop.PolicyControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement
-    properties:
-      policy_type_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-      policy_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: false
-  org.onap.policy.clamp.controlloop.CDSControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    properties:
-      cds_blueprint_id:
-        type: onap.datatypes.ToscaConceptIdentifier
-        requred: true
-  org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    properties:
-      chart:
-        type: string
-        required: true
-      configs:
-        type: list
-        required: false
-      requirements:
-        type: string
-        requred: false
-      templates:
-        type: list
-        required: false
-        entry_schema:
-      values:
-        type: string
-        requred: true
-  org.onap.policy.clamp.controlloop.HttpControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    properties:
-      baseUrl:
-        type: string
-        required: true
-        description: The base URL to be prepended to each path, identifies the host for the REST endpoints.
-      httpHeaders:
-        type: map
-        required: false
-        entry_schema:
-          type: string
-        description: HTTP headers to send on REST requests
-      configurationEntities:
-        type: map
-        required: true
-        entry_schema:
-          type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity
-          typeVersion: 1.0.0
-        description: The connfiguration entities the Control Loop Element is managing and their associated REST requests
-
-topology_template:
-  inputs:
-    pmsh_monitoring_policy:
-      type: onap.datatypes.ToscaConceptIdentifier
-      description: The ID of the PMSH monitoring policy to use
-      default:
-        name: MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test
-        version: 1.0.0
-    pmsh_operational_policy:
-      type: onap.datatypes.ToscaConceptIdentifier
-      description: The ID of the PMSH operational policy to use
-      default:
-        name: operational.apex.pmcontrol
-        version: 1.0.0
-  node_templates:
-    org.onap.policy.controlloop.PolicyControlLoopParticipant:
-      version: 2.3.1
-      type: org.onap.policy.clamp.controlloop.Participant
-      type_version: 1.0.1
-      description: Participant for DCAE microservices
-      properties:
-        provider: ONAP
-    org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop element for the monitoring policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
-          version: 2.3.1
-        policy_type_id:
-          name: onap.policies.monitoring.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          get_input: pmsh_monitoring_policy
-    org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop element for the operational policy for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-        participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
-          version: 2.3.1
-        policy_type_id:
-          name: onap.policies.operational.pm-subscription-handler
-          version: 1.0.0
-        policy_id:
-          get_input: pmsh_operational_policy
-    org.onap.domain.pmsh.DerivedPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
-          version: 2.3.1
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-    org.onap.domain.pmsh.DerivedDerivedPolicyControlLoopElement:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement
-      type_version: 1.0.0
-      description: Control loop for Performance Management Subscription Handling
-      properties:
-        provider: Ericsson
-        participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
-          version: 2.3.1
-        participant_id:
-          name: org.onap.PM_Policy
-          version: 1.0.0
-    org.onap.k8s.controlloop.K8SControlLoopParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.controlloop.Participant
-      type_version: 1.0.1
-      description: Participant for K8S
-      properties:
-        provider: ONAP
-    org.onap.domain.database.PMSH_K8SMicroserviceControlLoopElement:
-      # Chart from new repository
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement
-      type_version: 1.0.0
-      description: Control loop element for the K8S microservice for PMSH
-      properties:
-        provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.k8s.controlloop.K8SControlLoopParticipant
-          version: 2.3.4
-        chart:
-          chartId:
-            name: dcae-pmsh
-            version: 8.0.0
-          namespace: onap
-          releaseName: pmshms
-          repository:
-            repoName: chartmuseum
-            protocol: http
-            address: 10.152.183.120
-            port: 80
-            userName: onapinitializer
-            password: demo123456!
-          overrideParams:
-            global.masterPassword: test
-
-    org.onap.domain.database.Local_K8SMicroserviceControlLoopElement:
-      # Chart installation without passing repository info
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement
-      type_version: 1.0.0
-      description: Control loop element for the K8S microservice for local chart
-      properties:
-        provider: ONAP
-        participant_id:
-          name: K8sParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.k8s.controlloop.K8SControlLoopParticipant
-          version: 2.3.4
-        chart:
-          chartId:
-            name: nginx-ingress
-            version: 0.9.1
-          releaseName: nginxms
-          namespace: test
-    org.onap.controlloop.HttpControlLoopParticipant:
-      version: 2.3.4
-      type: org.onap.policy.clamp.controlloop.Participant
-      type_version: 1.0.1
-      description: Participant for Http requests
-      properties:
-        provider: ONAP
-    org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement:
-      # Consul http config for PMSH.
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.HttpControlLoopElement
-      type_version: 1.0.1
-      description: Control loop element for the http requests of PMSH microservice
-      properties:
-        provider: ONAP
-        participant_id:
-          name: HttpParticipant0
-          version: 1.0.0
-        participantType:
-          name: org.onap.k8s.controlloop.HttpControlLoopParticipant
-          version: 2.3.4
-        uninitializedToPassiveTimeout: 180
-        startPhase: 1
-        baseUrl: http://10.152.183.51:8500
-        httpHeaders:
-          Content-Type: application/json
-        configurationEntities:
-          - configurationEntityId:
-              name: entity1
-              version: 1.0.1
-            restSequence:
-              - restRequestId:
-                  name: request1
-                  version: 1.0.1
-                httpMethod: PUT
-                path: v1/kv/dcae-pmsh2
-                body: '{
-      "control_loop_name":"pmsh-control-loop",
-      "operational_policy_name":"pmsh-operational-policy",
-      "aaf_password":"demo123456!",
-      "aaf_identity":"dcae@dcae.onap.org",
-      "cert_path":"/opt/app/pmsh/etc/certs/cert.pem",
-      "key_path":"/opt/app/pmsh/etc/certs/key.pem",
-      "ca_cert_path":"/opt/app/pmsh/etc/certs/cacert.pem",
-      "enable_tls":"true",
-      "pmsh_policy":{
-         "subscription":{
-            "subscriptionName":"ExtraPM-All-gNB-R2B",
-            "administrativeState":"UNLOCKED",
-            "fileBasedGP":15,
-            "fileLocation":"\/pm\/pm.xml",
-            "nfFilter":{
-               "nfNames":[
-                  "^pnf.*",
-                  "^vnf.*"
-               ],
-               "modelInvariantIDs":[
-               ],
-               "modelVersionIDs":[
-               ],
-               "modelNames":[
-               ]
-            },
-            "measurementGroups":[
-               {
-                  "measurementGroup":{
-                     "measurementTypes":[
-                        {
-                           "measurementType":"countera"
-                        },
-                        {
-                           "measurementType":"counterb"
-                        }
-                     ],
-                     "managedObjectDNsBasic":[
-                        {
-                           "DN":"dna"
-                        },
-                        {
-                           "DN":"dnb"
-                        }
-                     ]
-                  }
-               },
-               {
-                  "measurementGroup":{
-                     "measurementTypes":[
-                        {
-                           "measurementType":"counterc"
-                        },
-                        {
-                           "measurementType":"counterd"
-                        }
-                     ],
-                     "managedObjectDNsBasic":[
-                        {
-                           "DN":"dnc"
-                        },
-                        {
-                           "DN":"dnd"
-                        }
-                     ]
-                  }
-               }
-            ]
-         }
-      },
-      "streams_subscribes":{
-         "aai_subscriber":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/AAI_EVENT",
-               "client_role":"org.onap.dcae.aaiSub",
-               "location":"san-francisco",
-               "client_id":"1575976809466"
-            }
-         },
-         "policy_pm_subscriber":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
-               "client_role":"org.onap.dcae.pmSubscriber",
-               "location":"san-francisco",
-               "client_id":"1575876809456"
-            }
-         }
-      },
-      "streams_publishes":{
-         "policy_pm_publisher":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
-               "client_role":"org.onap.dcae.pmPublisher",
-               "location":"san-francisco",
-               "client_id":"1475976809466"
-            }
-         },
-         "other_publisher":{
-            "type":"message_router",
-            "dmaap_info":{
-               "topic_url":"https://10.152.183.151:3905/events/org.onap.dmaap.mr.SOME_OTHER_TOPIC",
-               "client_role":"org.onap.dcae.pmControlPub",
-               "location":"san-francisco",
-               "client_id":"1875976809466"
-            }
-         }
-      }
-   }'
-                expectedResponse: 200
-    org.onap.domain.sample.GenericK8s_ControlLoopDefinition:
-      version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.ControlLoop
-      type_version: 1.0.0
-      description: Control loop for Hello World
-      properties:
-        provider: ONAP
-        elements:
-          - name: org.onap.domain.database.PMSH_K8SMicroserviceControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.database.Local_K8SMicroserviceControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.DerivedPolicyControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.DerivedDerivedPolicyControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement
-            version: 1.2.3
-          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement
-            version: 1.2.3