69 files changed, 72 insertions, 72 deletions

diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestCommonHeader.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java
index 2e456bca0..93a05f424 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestCommonHeader.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java
@@ -54,7 +54,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestCommonHeader {
+public class CommonHeaderTest {
 
     @Test
     public void testCommonHeader() {
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestEnums.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/EnumsTest.java
index 95adec84f..afb9a312e 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestEnums.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/EnumsTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
-public class TestEnums {
+public class EnumsTest {
 
     @Test
     public void testResponseCode() {
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestRequest.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
index 462fb7a01..e0c850b60 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestRequest.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
@@ -31,7 +31,7 @@ import java.util.Map;
 
 import org.junit.Test;
 
-public class TestRequest {
+public class RequestTest {
 
     @Test
     public void testRequest() {
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponseStatus.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java
index 46d8a0b25..ab8811d37 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponseStatus.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestResponseStatus {
+public class ResponseStatusTest {
 
     @Test
     public void testResonseStatus() {
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponse.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java
index bf5fec86a..ce0ba90a5 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponse.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java
@@ -31,7 +31,7 @@ import java.util.Map;
 
 import org.junit.Test;
 
-public class TestResponse {
+public class ResponseTest {
 
     @Test
     public void testResonse() {
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/TestSerialization.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/SerializationTest.java
index ae1890acf..6a3a3a099 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/TestSerialization.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/SerializationTest.java
@@ -29,7 +29,7 @@ import java.time.ZonedDateTime;
 
 import org.junit.Test;
 
-public class TestSerialization {
+public class SerializationTest {
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmCommonHeader.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmCommonHeaderTest.java
index 49cc7f7de..d48771a5c 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmCommonHeader.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmCommonHeaderTest.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestLcmCommonHeader {
+public class LcmCommonHeaderTest {
 
     @Test
     public void testLcmCommonHeader() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmRequest.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestTest.java
index ce8b0415e..5cc817d5e 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmRequest.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestTest.java
@@ -31,7 +31,7 @@ import java.util.Map;
 
 import org.junit.Test;
 
-public class TestLcmRequest {
+public class LcmRequestTest {
 
     @Test
     public void testLcmRequest() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmRequestWrapper.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestWrapperTest.java
index 0f1b85a33..42bb91876 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmRequestWrapper.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmRequestWrapperTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestLcmRequestWrapper {
+public class LcmRequestWrapperTest {
 
     @Test
     public void testLcmRequestWrapperWrapper() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmResonseCode.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResonseCodeTest.java
index cf42845cc..b83fc8d79 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmResonseCode.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResonseCodeTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
-public class TestLcmResonseCode {
+public class LcmResonseCodeTest {
 
     @Test
     public void testLcmResponseCode() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmResponseStatus.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseStatusTest.java
index b5d4cf3a5..c1a78e10a 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmResponseStatus.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseStatusTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestLcmResponseStatus {
+public class LcmResponseStatusTest {
 
     @Test
     public void testResonseStatus() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmResponseWrapper.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseWrapperTest.java
index bf448534f..2fc04794e 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmResponseWrapper.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmResponseWrapperTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestLcmResponseWrapper {
+public class LcmResponseWrapperTest {
 
     @Test
     public void testLcmResponseWrapperWrapper() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmWrapper.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmWrapperTest.java
index d14cb4b24..a12b7f775 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/TestLcmWrapper.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/LcmWrapperTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestLcmWrapper {
+public class LcmWrapperTest {
 
     @Test
     public void testLcmWrapper() {
diff --git a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/TestSerialization.java b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/SerializationTest.java
index 4e403ecb4..62f98644f 100644
--- a/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/TestSerialization.java
+++ b/controlloop/common/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/SerializationTest.java
@@ -28,7 +28,7 @@ import java.time.ZonedDateTime;
 
 import org.junit.Test;
 
-public class TestSerialization {
+public class SerializationTest {
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestGet.java b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/GetTest.java
index 7e881df51..11366c6a0 100755
--- a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestGet.java
+++ b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/GetTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.onap.policy.rest.RESTManager.Pair;
 
-public class TestGet {
+public class GetTest {
 
     @Test(expected = NullPointerException.class)
     public void testUrlNull() {
diff --git a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestPair.java b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java
index 28e9934d1..e245eabdb 100755
--- a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestPair.java
+++ b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.onap.policy.rest.RESTManager.Pair;
 
-public class TestPair {
+public class PairTest {
 
     @Test
     public void testPair() {
diff --git a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestPost.java b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PostTest.java
index 58ba5d247..aedd0b288 100755
--- a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestPost.java
+++ b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PostTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.onap.policy.rest.RESTManager.Pair;
 
-public class TestPost {
+public class PostTest {
 
     @Test
     public void testUsernameNull() {
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
index 2a1dc42b3..572a1186a 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestResourceInstance {
+public class ResourceInstanceTest {
 
     @Test
     public void testConstructors() {
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java
index 7b3a3e1f6..0ee68a11e 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestResource {
+public class ResourceTest {
 
     @Test
     public void testConstructors() {
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestServiceInstance.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
index 5ee4a9de8..14f2d3d37 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestServiceInstance.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestServiceInstance {
+public class ServiceInstanceTest {
 
     @Test
     public void testConstructors() {
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestService.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
index e5760236b..a7d223d18 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestService.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestService {
+public class ServiceTest {
 
     @Test
     public void testConstructors() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestDemo.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/DemoTest.java
index b002b7ced..843f24dd1 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestDemo.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/DemoTest.java
@@ -23,7 +23,7 @@ import java.util.LinkedList;
 import org.junit.Test;
 import org.onap.policy.sdnc.util.Serialization;
 
-public class TestDemo {
+public class DemoTest {
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncHealAdditionalParams.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncHealAdditionalParamsTest.java
index a282ddc39..0403dd0a5 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncHealAdditionalParams.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncHealAdditionalParamsTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestSdncHealAdditionalParams {
+public class SdncHealAdditionalParamsTest {
 
     @Test
     public void testSdncHealAdditionalParameters() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncHealRequest.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncHealRequestTest.java
index 96d19b7e1..705d3573f 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncHealRequest.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncHealRequestTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestSdncHealRequest {
+public class SdncHealRequestTest {
 
     @Test
     public void testSdncHealRequest() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncHealServiceInfo.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncHealServiceInfoTest.java
index 92bb4a727..17791a1d9 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncHealServiceInfo.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncHealServiceInfoTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestSdncHealServiceInfo {
+public class SdncHealServiceInfoTest {
 
     @Test
     public void testSdncHealServiceInfo() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncManager.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java
index ec6c0a5f1..b5ddec1be 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncManager.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java
@@ -47,7 +47,7 @@ import org.onap.policy.rest.RESTManager;
 import org.onap.policy.rest.RESTManager.Pair;
 import org.onap.policy.sdnc.util.Serialization;
 
-public class TestSdncManager {
+public class SdncManagerTest {
     private static WorkingMemory mockedWorkingMemory;
 
     private RESTManager   mockedRestManager;
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncRequest.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncRequestTest.java
index adb07b947..0c8a44898 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncRequest.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncRequestTest.java
@@ -28,7 +28,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestSdncRequest {
+public class SdncRequestTest {
 
     @Test
     public void testSdncRequest() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncResponseDescriptor.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncResponseDescriptorTest.java
index 5c882282b..5fdf2b3e2 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncResponseDescriptor.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncResponseDescriptorTest.java
@@ -29,7 +29,7 @@ import java.util.List;
 
 import org.junit.Test;
 
-public class TestSdncResponseDescriptor {
+public class SdncResponseDescriptorTest {
 
     @Test
     public void testSdncResponseDescriptor() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncResponse.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncResponseTest.java
index 5daa12ab9..aa879f04e 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/TestSdncResponse.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncResponseTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestSdncResponse {
+public class SdncResponseTest {
 
     @Test
     public void testSdncResponse() {
diff --git a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/util/TestSerialization.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/util/SerializationTest.java
index 9d02d4f87..9b3ab7856 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/util/TestSerialization.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/util/SerializationTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestSerialization {
+public class SerializationTest {
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciCommonHeader.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java
index 5c4dec3bc..4b3201440 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciCommonHeader.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestPciCommonHeader {
+public class PciCommonHeaderTest {
 
     @Test
     public void testPciCommonHeader() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciRequest.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java
index 3a84adcd4..64d976710 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciRequest.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestPciRequest {
+public class PciRequestTest {
 
     @Test
     public void testPciRequest() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciRequestWrapper.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java
index 7ab68a6ca..79f3c0d6f 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciRequestWrapper.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestPciRequestWrapper {
+public class PciRequestWrapperTest {
 
     @Test
     public void testPciRequestWrapperWrapper() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciResponseCode.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseCodeTest.java
index 056ce60e6..355713133 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciResponseCode.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseCodeTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
-public class TestPciResponseCode {
+public class PciResponseCodeTest {
 
     @Test
     public void testPciResponseCode() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciResponseWrapper.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseWrapperTest.java
index 2472d31c3..16f6f59e9 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciResponseWrapper.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciResponseWrapperTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestPciResponseWrapper {
+public class PciResponseWrapperTest {
 
     @Test
     public void testPciResponseWrapperWrapper() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciStatus.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java
index b09922342..b38eed3e3 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciStatus.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestPciStatus {
+public class PciStatusTest {
 
     @Test
     public void testResponseStatus() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciWrapper.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java
index e0964df65..a9501dddc 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/TestPciWrapper.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestPciWrapper {
+public class PciWrapperTest {
 
     @Test
     public void testPciWrapper() {
diff --git a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/TestSerialization.java b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java
index 7b139de73..e9793b286 100644
--- a/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/TestSerialization.java
+++ b/controlloop/common/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java
@@ -28,7 +28,7 @@ import java.time.ZonedDateTime;
 
 import org.junit.Test;
 
-public class TestSerialization {
+public class SerializationTest {
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestDemo.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
index 1b2cb697a..43cce61e1 100644
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestDemo.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
@@ -36,8 +36,8 @@ import org.onap.policy.so.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TestDemo {
-    private static final Logger logger = LoggerFactory.getLogger(TestDemo.class);
+public class DemoTest {
+    private static final Logger logger = LoggerFactory.getLogger(DemoTest.class);
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoAsyncRequestStatus.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
index 7c50ea097..d6fd0ad25 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoAsyncRequestStatus.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java
@@ -27,7 +27,7 @@ import java.time.LocalDateTime;
 
 import org.junit.Test;
 
-public class TestSoAsyncRequestStatus {
+public class SoAsyncRequestStatusTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoCloudConfiguration.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java
index bab8970bb..8b52ae9a2 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoCloudConfiguration.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoCloudConfigurationTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoCloudConfiguration {
+public class SoCloudConfigurationTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoDummyServer.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServerTest.java
index 2a352b0bf..17f92bcb9 100644
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoDummyServer.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoDummyServerTest.java
@@ -33,7 +33,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response;
 
 @Path("/SO")
-public class TestSoDummyServer {
+public class SoDummyServerTest {
 
     private static int postMessagesReceived = 0;
     private static int putMessagesReceived = 0;
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoInstanceReferences.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java
index ee083ae08..39e37f0cb 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoInstanceReferences.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoInstanceReferencesTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoInstanceReferences {
+public class SoInstanceReferencesTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoManager.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java
index 20cb54fca..c090513f6 100644
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoManager.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoManagerTest.java
@@ -46,7 +46,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.drools.system.PolicyEngine;
 
-public class TestSoManager {
+public class SoManagerTest {
     private static final String BASE_URI = "http://localhost:46553/TestSOManager";
     private static final String BASE_SO_URI = BASE_URI + "/SO";
     private static HttpServer server;
@@ -56,7 +56,7 @@ public class TestSoManager {
      */
     @BeforeClass
     public static void setUp() throws IOException {
-        final ResourceConfig rc = new ResourceConfig(TestSoDummyServer.class);
+        final ResourceConfig rc = new ResourceConfig(SoDummyServerTest.class);
         //Grizzly by default doesn't allow payload for HTTP methods (ex: DELETE), for which HTTP spec doesn't
         // explicitly state that.
         //allow it before starting the server
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoModelInfo.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java
index 037e82e4c..5898f04f0 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoModelInfo.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoModelInfoTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoModelInfo {
+public class SoModelInfoTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoPolicyExceptionHolder.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java
index 1c619a8c6..2dea68d8f 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoPolicyExceptionHolder.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoPolicyExceptionHolderTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoPolicyExceptionHolder {
+public class SoPolicyExceptionHolderTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstanceListElement.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java
index 83f1d5849..4c549361a 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstanceListElement.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceListElementTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoRelatedInstanceListElement {
+public class SoRelatedInstanceListElementTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstance.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java
index 048288377..aa137e19f 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstance.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRelatedInstanceTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoRelatedInstance {
+public class SoRelatedInstanceTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestDetails.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
index c4b024593..71ae7ca66 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestDetails.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java
@@ -31,7 +31,7 @@ import java.util.List;
 
 import org.junit.Test;
 
-public class TestSoRequestDetails {
+public class SoRequestDetailsTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestError.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java
index a3c19cf41..f700fbc70 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestError.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestErrorTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoRequestError {
+public class SoRequestErrorTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestInfo.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java
index a77fe8bf4..c09da54dc 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestInfo.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestInfoTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoRequestInfo {
+public class SoRequestInfoTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestParameters.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java
index 1ebf5d76f..db93988c9 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestParameters.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestParametersTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoRequestParameters {
+public class SoRequestParametersTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestReferences.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java
index 498a2e00b..5d6ff2090 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestReferences.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestReferencesTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoRequestReferences {
+public class SoRequestReferencesTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestStatus.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java
index 1b8d745fd..cd3e1b58a 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestStatus.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestStatusTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoRequestStatus {
+public class SoRequestStatusTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
index 2f9bf68bb..c09c58471 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequest.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java
@@ -28,7 +28,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestSoRequest {
+public class SoRequestTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponse.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java
index cf9a85e83..cf396561b 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponse.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoResponse {
+public class SoResponseTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponseWrapper.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
index d7ef9708d..181fe2138 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponseWrapper.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java
@@ -29,7 +29,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestSoResponseWrapper {
+public class SoResponseWrapperTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoServiceExceptionHolder.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java
index 7c802efaf..b0ce56652 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoServiceExceptionHolder.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoServiceExceptionHolderTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoServiceExceptionHolder {
+public class SoServiceExceptionHolderTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoSubscriberInfo.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java
index b0662fa30..ea38bd597 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoSubscriberInfo.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/SoSubscriberInfoTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class TestSoSubscriberInfo {
+public class SoSubscriberInfoTest {
 
     @Test
     public void testConstructor() {
diff --git a/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/TestDemo.java b/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/DemoTest.java
index f35087794..bd59f8bc1 100644
--- a/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/TestDemo.java
+++ b/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/DemoTest.java
@@ -29,8 +29,8 @@ import org.onap.policy.vnf.trafficgenerator.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TestDemo {
-    private static final Logger logger = LoggerFactory.getLogger(TestDemo.class);
+public class DemoTest {
+    private static final Logger logger = LoggerFactory.getLogger(DemoTest.class);
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestDemo.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java
index a5f40f30e..dae87b6a6 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestDemo.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java
@@ -24,7 +24,7 @@ import java.util.LinkedList;
 import org.junit.Test;
 import org.onap.policy.vfc.util.Serialization;
 
-public class TestDemo {
+public class DemoTest {
 
     @Test
     public void test() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealActionVmInfo.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealActionVmInfoTest.java
index 55f9ab8d5..10964a909 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealActionVmInfo.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealActionVmInfoTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestVfcHealActionVmInfo {
+public class VfcHealActionVmInfoTest {
 
     @Test
     public void testVfcHealActionVmInfo() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealAdditionalParams.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java
index b74fe1a93..ca2d844c1 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealAdditionalParams.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestVfcHealAdditionalParams {
+public class VfcHealAdditionalParamsTest {
 
     @Test
     public void testVfcHealAdditionalParameters() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealRequest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealRequestTest.java
index 4c442bc2c..0a256a59b 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcHealRequest.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealRequestTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestVfcHealRequest {
+public class VfcHealRequestTest {
 
     @Test
     public void testVfcHealRequest() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcManager.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java
index 7e4bda81d..ab8161164 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcManager.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java
@@ -46,7 +46,7 @@ import org.onap.policy.rest.RESTManager;
 import org.onap.policy.rest.RESTManager.Pair;
 import org.onap.policy.vfc.util.Serialization;
 
-public class TestVfcManager {
+public class VfcManagerTest {
     private static WorkingMemory mockedWorkingMemory;
 
     private RESTManager   mockedRestManager;
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcRequest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java
index 0ec5d7d82..95589154f 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcRequest.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java
@@ -29,7 +29,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class TestVfcRequest {
+public class VfcRequestTest {
 
     @Test
     public void testVfcRequest() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponseDescriptor.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java
index 927306fd8..9ab180767 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponseDescriptor.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java
@@ -30,7 +30,7 @@ import java.util.List;
 
 import org.junit.Test;
 
-public class TestVfcResponseDescriptor {
+public class VfcResponseDescriptorTest {
 
     @Test
     public void testVfcResponseDescriptor() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponse.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseTest.java
index 698459ad2..f333c4165 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/TestVfcResponse.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestVfcResponse {
+public class VfcResponseTest {
 
     @Test
     public void testVfcResponse() {
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/TestSerialization.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/SerializationTest.java
index b66806213..beceb045a 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/TestSerialization.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/util/SerializationTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class TestSerialization {
+public class SerializationTest {
 
     @Test
     public void test() {