42 files changed, 64 insertions, 64 deletions
diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/TestGeneration.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/GenerationTest.java
index 851c06631..3b79e805c 100644
--- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/TestGeneration.java
+++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/GenerationTest.java
@@ -39,7 +39,7 @@ import org.stringtemplate.v4.STGroupFile;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class TestGeneration {
+public class GenerationTest {
 
     /**
      * Get the chunks for the codegen.
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestExceptions.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java
index 1fa3928b5..70c79a1ef 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestExceptions.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.model.policymodel.concepts.PolicyRuntimeException;
  * Test model exceptions.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestExceptions {
+public class ExceptionsTest {
 
     @Test
     public void test() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestLogic.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java
index 710b360f9..70db66348 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestLogic.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java
@@ -42,7 +42,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTaskSelectionLogic;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestLogic {
+public class LogicTest {
 
     @Test
     public void testLogic() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicies.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java
index 1e0e88c7b..edf045a06 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicies.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java
@@ -41,14 +41,14 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicy;
 import org.onap.policy.apex.model.policymodel.concepts.AxState;
 import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput;
 import org.onap.policy.apex.model.policymodel.concepts.AxStateTree;
-import org.onap.policy.apex.model.policymodel.handling.TestApexPolicyModelCreator;
+import org.onap.policy.apex.model.policymodel.handling.ApexPolicyModelCreatorTest;
 
 /**
  * Test apex policies.
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestPolicies {
+public class PoliciesTest {
 
     @Test
     public void testPolicies() {
@@ -113,7 +113,7 @@ public class TestPolicies {
 
         assertEquals("PolicyName:0.0.1", policy.getKeys().get(0).getId());
 
-        policy = new TestApexPolicyModelCreator().getModel().getPolicies().get("policy");
+        policy = new ApexPolicyModelCreatorTest().getModel().getPolicies().get("policy");
 
         AxValidationResult result = new AxValidationResult();
         result = policy.validate(result);
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicyModel.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java
index b2803c4f8..e1f1f90c3 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestPolicyModel.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java
@@ -46,14 +46,14 @@ import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskOutputType;
 import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskReference;
 import org.onap.policy.apex.model.policymodel.concepts.AxTaskSelectionLogic;
 import org.onap.policy.apex.model.policymodel.concepts.AxTasks;
-import org.onap.policy.apex.model.policymodel.handling.TestApexPolicyModelCreator;
+import org.onap.policy.apex.model.policymodel.handling.ApexPolicyModelCreatorTest;
 
 /**
  * Test policy models.
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestPolicyModel {
+public class PolicyModelTest {
 
     @Test
     public void testPolicyModel() {
@@ -148,7 +148,7 @@ public class TestPolicyModel {
                         new AxKeyInformation(keyInfoKey), new AxEvents(eventsKey), new AxContextAlbums(albumsKey),
                         new AxTasks(tasksKey), new AxPolicies(policiesKey))));
 
-        model = new TestApexPolicyModelCreator().getModel();
+        model = new ApexPolicyModelCreatorTest().getModel();
 
         AxValidationResult result = new AxValidationResult();
         result = model.validate(result);
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateOutput.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java
index 90b486053..901d641cb 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateOutput.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxStateOutput;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestStateOutput {
+public class StateOutputTest {
 
     @Test
     public void testStateOutput() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateTaskReference.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java
index 90c7001b8..cfc8a494e 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestStateTaskReference.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxStateTaskReference;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestStateTaskReference {
+public class StateTaskReferenceTest {
 
     @Test
     public void testStateTaskReference() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestState.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java
index ea32c9ca6..1f71e9ec0 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestState.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java
@@ -43,7 +43,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestState {
+public class StateTest {
 
     @Test
     public void testState() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTaskParameter.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java
index 4eb2c4232..ecc8a4f66 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTaskParameter.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTaskParameter;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestTaskParameter {
+public class TaskParameterTest {
 
     @Test
     public void testTaskParameter() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTasks.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java
index 4f6292f04..248dd6307 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TestTasks.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java
@@ -47,7 +47,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTasks;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestTasks {
+public class TasksTest {
 
     @Test
     public void testTasks() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModelCreator.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelCreatorTest.java
index cbcecc589..604d8c3bc 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModelCreator.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelCreatorTest.java
@@ -56,7 +56,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxTasks;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexPolicyModelCreator implements TestApexModelCreator<AxPolicyModel> {
+public class ApexPolicyModelCreatorTest implements TestApexModelCreator<AxPolicyModel> {
 
     @Override
     public AxPolicyModel getModel() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModel.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java
index 6c4fd5174..997664b13 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestApexPolicyModel.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java
@@ -35,7 +35,7 @@ import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
 
-public class TestApexPolicyModel {
+public class ApexPolicyModelTest {
     private Connection connection;
     TestApexModel<AxPolicyModel> testApexModel;
 
@@ -49,7 +49,7 @@ public class TestApexPolicyModel {
         Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
         connection = DriverManager.getConnection("jdbc:derby:memory:apex_test;create=true");
 
-        testApexModel = new TestApexModel<AxPolicyModel>(AxPolicyModel.class, new TestApexPolicyModelCreator());
+        testApexModel = new TestApexModel<AxPolicyModel>(AxPolicyModel.class, new ApexPolicyModelCreatorTest());
     }
 
     @After
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyAnalyser.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java
index 40aa51ffe..425509d3a 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyAnalyser.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java
@@ -28,10 +28,10 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
 import org.onap.policy.apex.model.policymodel.handling.PolicyAnalyser;
 import org.onap.policy.apex.model.policymodel.handling.PolicyAnalysisResult;
 
-public class TestPolicyAnalyser {
+public class PolicyAnalyserTest {
     @Test
     public void test() {
-        final AxPolicyModel apexModel = new TestApexPolicyModelCreator().getModel();
+        final AxPolicyModel apexModel = new ApexPolicyModelCreatorTest().getModel();
 
         final PolicyAnalyser policyAnalyser = new PolicyAnalyser();
         final PolicyAnalysisResult analysisResult = policyAnalyser.analyse(apexModel);
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java
index 528898d30..23f9d3820 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java
@@ -35,7 +35,7 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyLogicReader;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestPolicyLogicReader {
+public class PolicyLogicReaderTest {
 
     @Test
     public void test() {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelComparer.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java
index 3511b54ba..08d00e628 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelComparer.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java
@@ -35,11 +35,11 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyComparer;
 import org.onap.policy.apex.model.policymodel.handling.PolicyModelComparer;
 import org.onap.policy.apex.model.utilities.TextFileUtils;
 
-public class TestPolicyModelComparer {
+public class PolicyModelComparerTest {
 
     @Test
     public void testPolicyComparer() throws IOException {
-        final AxPolicyModel leftApexModel = new TestApexPolicyModelCreator().getModel();
+        final AxPolicyModel leftApexModel = new ApexPolicyModelCreatorTest().getModel();
         final AxPolicyModel rightApexModel = new AxPolicyModel(leftApexModel);
 
         PolicyModelComparer policyModelComparer = new PolicyModelComparer(leftApexModel, rightApexModel);
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelMerger.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java
index 8f717a234..7d5ba6a40 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelMerger.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java
@@ -35,12 +35,12 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyModelMerger;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestPolicyModelMerger {
+public class PolicyModelMergerTest {
 
     @Test
     public void testPolicyModelMerger() {
-        final AxPolicyModel leftPolicyModel = new TestApexPolicyModelCreator().getModel();
-        AxPolicyModel rightPolicyModel = new TestApexPolicyModelCreator().getModel();
+        final AxPolicyModel leftPolicyModel = new ApexPolicyModelCreatorTest().getModel();
+        AxPolicyModel rightPolicyModel = new ApexPolicyModelCreatorTest().getModel();
 
         try {
             final AxPolicyModel mergedPolicyModel = PolicyModelMerger.getMergedPolicyModel(leftPolicyModel,
@@ -99,7 +99,7 @@ public class TestPolicyModelMerger {
             fail("test should not throw an exception");
         }
 
-        rightPolicyModel = new TestApexPolicyModelCreator().getAnotherModel();
+        rightPolicyModel = new ApexPolicyModelCreatorTest().getAnotherModel();
         try {
             final AxPolicyModel mergedPolicyModel = PolicyModelMerger.getMergedPolicyModel(leftPolicyModel,
                             rightPolicyModel, true);
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelSplitter.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java
index fde6e3712..29e7307f4 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyModelSplitter.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java
@@ -34,10 +34,10 @@ import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
 import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
 import org.onap.policy.apex.model.policymodel.handling.PolicyModelSplitter;
 
-public class TestPolicyModelSplitter {
+public class PolicyModelSplitterTest {
     @Test
     public void test() {
-        final AxPolicyModel apexModel = new TestApexPolicyModelCreator().getModel();
+        final AxPolicyModel apexModel = new ApexPolicyModelCreatorTest().getModel();
 
         final Set<AxArtifactKey> requiredPolicySet = new TreeSet<AxArtifactKey>();
         requiredPolicySet.add(new AxArtifactKey("policy", "0.0.1"));
diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/KeyComparerTest.java
index 538028de0..45afc2088 100644
--- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/KeyComparerTest.java
@@ -31,7 +31,7 @@ import org.onap.policy.apex.model.utilities.comparison.KeyDifference;
  * Test key comparisons.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestKeyComparer {
+public class KeyComparerTest {
 
     @Test
     public void test() {
diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/KeyedMapComparerTest.java
index de71ea164..7fb3a5bb7 100644
--- a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/KeyedMapComparerTest.java
@@ -35,7 +35,7 @@ import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestKeyedMapComparer {
+public class KeyedMapComparerTest {
 
     @Test
     public void test() {
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAai.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaAaiTest.java
index bca896d2e..b92615932 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAai.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaAaiTest.java
@@ -47,7 +47,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version 
  */
-public class TestAvroSchemaAai {
+public class AvroSchemaAaiTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String aaiInventoryResponseSchema;
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaArrayTest.java
index 972e0bd32..e72f7c7b3 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaArrayTest.java
@@ -47,7 +47,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version 
  */
-public class TestAvroSchemaArray {
+public class AvroSchemaArrayTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String longArraySchema;
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaEnumTest.java
index 883f14bcb..54a46958b 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaEnumTest.java
@@ -48,7 +48,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version 
  */
-public class TestAvroSchemaEnum {
+public class AvroSchemaEnumTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String enumSchema;
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaFixedTest.java
index 26f4ba8af..7fb417c78 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaFixedTest.java
@@ -48,7 +48,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version
  */
-public class TestAvroSchemaFixed {
+public class AvroSchemaFixedTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String fixedSchema;
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperBadSchemasTest.java
index cc79f9eb6..0eae99bfc 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperBadSchemasTest.java
@@ -42,7 +42,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version 
  */
-public class TestAvroSchemaHelperBadSchemas {
+public class AvroSchemaHelperBadSchemasTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
 
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperMarshalTest.java
index 86d8426de..6d3ebb30a 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperMarshalTest.java
@@ -44,7 +44,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version
  */
-public class TestAvroSchemaHelperMarshal {
+public class AvroSchemaHelperMarshalTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
 
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperUnmarshalTest.java
index 6dede515e..a8711e06d 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperUnmarshalTest.java
@@ -45,7 +45,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version
  */
-public class TestAvroSchemaHelperUnmarshal {
+public class AvroSchemaHelperUnmarshalTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
 
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaMapTest.java
index 37069be47..666dd064b 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaMapTest.java
@@ -49,7 +49,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version
  */
-public class TestAvroSchemaMap {
+public class AvroSchemaMapTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String longMapSchema;
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaRecordTest.java
index b79a5cd91..35e305734 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaRecordTest.java
@@ -49,7 +49,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version
  */
-public class TestAvroSchemaRecord {
+public class AvroSchemaRecordTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String recordSchema;
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaUnionTest.java
index c957d8d4c..720b5046d 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaUnionTest.java
@@ -47,7 +47,7 @@ import org.onap.policy.common.parameters.ParameterService;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @version 
  */
-public class TestAvroSchemaUnion {
+public class AvroSchemaUnionTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String uinionSchema;
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/HealthCheckSchemaTest.java
index 646b8aa04..9d99c2b6e 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/HealthCheckSchemaTest.java
@@ -48,7 +48,7 @@ import org.onap.policy.common.parameters.ParameterService;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestHealthCheckSchema {
+public class HealthCheckSchemaTest {
     private final AxKey testKey = new AxArtifactKey("AvroTest", "0.0.1");
     private AxContextSchemas schemas;
     private String healthCheckSchema;
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestorEndpoint.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/RestRequestorEndpointTest.java
index 860127a7b..f84b6a703 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestorEndpoint.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/RestRequestorEndpointTest.java
@@ -38,7 +38,7 @@ import javax.ws.rs.core.Response;
  * The Class TestRestRequestorEndpoint.
  */
 @Path("/apex")
-public class TestRestRequestorEndpoint {
+public class RestRequestorEndpointTest {
 
     private static Object counterLock = new Object();
     private static int postMessagesReceived = 0;
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestor.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/RestRequestorTest.java
index 1ace80906..7abed5a41 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestor.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/RestRequestorTest.java
@@ -51,7 +51,7 @@ import org.onap.policy.apex.service.engine.main.ApexMain;
 /**
  * The Class TestRestRequestor.
  */
-public class TestRestRequestor {
+public class RestRequestorTest {
     private static final String BASE_URI = "http://localhost:32801/TestRESTRequestor";
     private static HttpServer server;
 
@@ -68,7 +68,7 @@ public class TestRestRequestor {
      */
     @BeforeClass
     public static void setUp() throws Exception {
-        final ResourceConfig rc = new ResourceConfig(TestRestRequestorEndpoint.class);
+        final ResourceConfig rc = new ResourceConfig(RestRequestorEndpointTest.class);
         server = GrizzlyHttpServerFactory.createHttpServer(URI.create(BASE_URI), rc);
 
         while (!server.isStarted()) {
@@ -95,7 +95,7 @@ public class TestRestRequestor {
      */
     @Before
     public void resetCounters() {
-        TestRestRequestorEndpoint.resetCounters();
+        RestRequestorEndpointTest.resetCounters();
     }
 
     /**
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/TestXmlEventHandler.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
index 1e42bef30..685a1f236 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/TestXmlEventHandler.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
@@ -38,8 +38,8 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestXmlEventHandler {
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestXmlEventHandler.class);
+public class XmlEventHandlerTest {
+    private static final XLogger logger = XLoggerFactory.getXLogger(XmlEventHandlerTest.class);
 
     /**
      * Test XML to apex event.
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/TestXmlTaggedEventConsumer.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java
index 475373a7c..aeb37331a 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/TestXmlTaggedEventConsumer.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java
@@ -36,7 +36,7 @@ import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer
 /**
  * The Class TestXmlTaggedEventConsumer.
  */
-public class TestXmlTaggedEventConsumer {
+public class XmlTaggedEventConsumerTest {
 
     /**
      * Test garbage text line.
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/TestYamlEventProtocol.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlEventProtocolTest.java
index 1d2a1d9f7..2b6a13f89 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/TestYamlEventProtocol.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlEventProtocolTest.java
@@ -52,7 +52,7 @@ import org.onap.policy.common.parameters.ParameterService;
 /**
  * The Class TestYamlEventProtocol.
  */
-public class TestYamlEventProtocol {
+public class YamlEventProtocolTest {
 
     /**
      * Register test events and schemas.
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/TestYamlPluginStability.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlPluginStabilityTest.java
index d033de56d..7f62961be 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/TestYamlPluginStability.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/test/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlPluginStabilityTest.java
@@ -48,7 +48,7 @@ import org.onap.policy.common.parameters.ParameterService;
 /**
  * The Class TestYamlPluginStability.
  */
-public class TestYamlPluginStability {
+public class YamlPluginStabilityTest {
     static AxEvent testEvent;
 
     /**
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmark.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmarkTest.java
index fa2a9934c..99035f7bf 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmark.java
+++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmarkTest.java
@@ -37,9 +37,9 @@ import org.slf4j.ext.XLoggerFactory;
 /**
  * The Class ApexEngineBenchmark.
  */
-public class ApexEngineBenchmark {
+public class ApexEngineBenchmarkTest {
     // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEngineBenchmark.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEngineBenchmarkTest.class);
 
     private static final String TARGET = "apex";
     private static final String SOURCE = "test";
@@ -132,7 +132,7 @@ public class ApexEngineBenchmark {
             throws Exception {
 
         LOGGER.info("Running Test with Event count: {}, Instance count: {} and loop: {}", eventsCount, threads, loop);
-        final TestApexEventListener apexEventListener = new TestApexEventListener();
+        final ApexEventListenerTest apexEventListener = new ApexEventListenerTest();
 
         final ApexBaseBenchMarkTest apexBaseBenchMarkTest =
                 new ApexBaseBenchMarkTest(policyModel, threads, apexEventListener);
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/TestApexEventListener.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEventListenerTest.java
index 2b6c89de7..a5950df97 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/TestApexEventListener.java
+++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEventListenerTest.java
@@ -42,10 +42,10 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @see TestApexEventEvent
  */
-public class TestApexEventListener implements ApexEventListener {
+public class ApexEventListenerTest implements ApexEventListener {
 
     private static final String SENT_TIMESTAMP = "SentTimestamp";
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestApexEventListener.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEventListenerTest.class);
     private static final String RECVD_TIMESTAMP = "RecvdTimestamp";
     private Queue<ApexEvent> queue;
 
@@ -54,7 +54,7 @@ public class TestApexEventListener implements ApexEventListener {
     /**
      * Instantiates a new test apex event listener.
      */
-    public TestApexEventListener() {
+    public ApexEventListenerTest() {
         this.queue = new ConcurrentLinkedQueue<ApexEvent>();
     }
 
diff --git a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/TestMetrics.java b/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java
index 13610121a..af6b46918 100644
--- a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/TestMetrics.java
+++ b/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java
@@ -40,9 +40,9 @@ import org.slf4j.ext.XLoggerFactory;
 /**
  * The Class TestMetrics.
  */
-public class TestMetrics {
+public class MetricsTest {
     // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestMetrics.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(MetricsTest.class);
     private static final String HAZELCAST_CONFIG = "hazelcast.config";
 
     private static final String JAVA_NET_PREFER_IPV4_STACK = "java.net.preferIPv4Stack";
diff --git a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/TestCliParser.java b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/CliParserTest.java
index bf14cfec0..9cd7b71e3 100644
--- a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/TestCliParser.java
+++ b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/CliParserTest.java
@@ -30,9 +30,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class TestCliParser {
+public class CliParserTest {
 
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestCliParser.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(CliParserTest.class);
 
     /** Testapp version. */
     @Test
diff --git a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleAppVersion.java b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleAppVersionTest.java
index 6d6fa9c1d..2433e3c5c 100644
--- a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleAppVersion.java
+++ b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleAppVersionTest.java
@@ -39,9 +39,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class ExampleAppVersion {
+public class ExampleAppVersionTest {
 
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ExampleAppVersion.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ExampleAppVersionTest.class);
 
     /** Test example app version. */
     @Test
diff --git a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParser.java b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParserTest.java
index b93038604..723ad8739 100644
--- a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParser.java
+++ b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParserTest.java
@@ -46,9 +46,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class ExampleCliParser {
+public class ExampleCliParserTest {
 
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ExampleCliParser.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ExampleCliParserTest.class);
 
     /**
      * Test example parser.