62 files changed, 72 insertions, 72 deletions

diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestCommandLineEditorEventsContext.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorEventsContextTest.java
index b0d82b6fa..efd12f4e4 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestCommandLineEditorEventsContext.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorEventsContextTest.java
@@ -36,7 +36,7 @@ import org.onap.policy.apex.model.utilities.TextFileUtils;
 /**
  * The Class TestCLIEditorEventsContext.
  */
-public class TestCommandLineEditorEventsContext {
+public class CommandLineEditorEventsContextTest {
     // CHECKSTYLE:OFF: MagicNumber
 
     private static final Path SRC_MAIN_FOLDER = Paths.get("src/main/resources/");
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestCommandLineEditorOptions.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorOptionsTest.java
index 5ff87c01b..227cb23f5 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestCommandLineEditorOptions.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorOptionsTest.java
@@ -38,7 +38,7 @@ import org.onap.policy.apex.model.utilities.TextFileUtils;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestCommandLineEditorOptions {
+public class CommandLineEditorOptionsTest {
     // CHECKSTYLE:OFF: MagicNumber
 
     /**
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestCommandLineEditorScripting.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java
index 1b49fb362..35b725f2a 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestCommandLineEditorScripting.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorScriptingTest.java
@@ -41,7 +41,7 @@ import org.onap.policy.common.utils.resources.ResourceUtils;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestCommandLineEditorScripting {
+public class CommandLineEditorScriptingTest {
 
     private File tempModelFile;
     private File tempLogFile;
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestContextAlbums.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java
index a45212007..21f1e1969 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestContextAlbums.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/ContextAlbumsTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.common.utils.resources.ResourceUtils;
 /**
  * The Class TestContextAlbums.
  */
-public class TestContextAlbums {
+public class ContextAlbumsTest {
     private String[] logicBlockArgs;
 
     private File tempModelFile;
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestFileMacro.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java
index 3195bf025..5bded368e 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestFileMacro.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/FileMacroTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.common.utils.resources.ResourceUtils;
 /**
  * Test FileMacro in the CLI.
  */
-public class TestFileMacro {
+public class FileMacroTest {
     private String[] fileMacroArgs;
 
     private File tempModelFile;
diff --git a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestLogicBlock.java b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java
index 1a4f75576..8f6f193c1 100644
--- a/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/TestLogicBlock.java
+++ b/auth/cli-editor/src/test/java/org/onap/policy/apex/auth/clieditor/LogicBlockTest.java
@@ -38,7 +38,7 @@ import org.onap.policy.common.utils.resources.ResourceUtils;
 /**
  * The Class TestLogicBlock.
  */
-public class TestLogicBlock {
+public class LogicBlockTest {
     private String[] logicBlockArgs;
     private String[] avroSchemaArgs;
 
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/TestApexEditorStartup.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java
index 0fad411a5..54e40ae77 100644
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/TestApexEditorStartup.java
+++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.client.editor.rest.ApexEditorMain.EditorState;
 /**
  * Test Apex Editor Startup.
  */
-public class TestApexEditorStartup {
+public class ApexEditorStartupTest {
     // CHECKSTYLE:OFF: MagicNumber
 
     /**
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/TestExceptions.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java
index e63fb9e45..987076fd1 100644
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/TestExceptions.java
+++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
  * Test Apex Editor Exceptions.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestExceptions {
+public class ExceptionsTest {
 
     @Test
     public void test() {
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/TestApexEditorRestResource.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java
index 3585959f5..f0a847814 100644
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/TestApexEditorRestResource.java
+++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.utilities.TextFileUtils;
  * Test Apex Editor Rest Resource.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexEditorRestResource extends JerseyTest {
+public class ApexEditorRestResourceTest extends JerseyTest {
     @Override
     protected Application configure() {
         return new ResourceConfig(ApexEditorRestResource.class);
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/TestBeans.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeansTest.java
index 72cbae22c..2cae7703d 100644
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/TestBeans.java
+++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeansTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
  * Test the beans.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestBeans {
+public class BeansTest {
 
     @Test
     public void testBeans() {
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdateTest.java
index 54440370c..218a8f9af 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdateTest.java
@@ -35,9 +35,9 @@ import org.onap.policy.common.parameters.ParameterService;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
-public class TestContextAlbumUpdate {
+public class ContextAlbumUpdateTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextAlbumUpdate.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ContextAlbumUpdateTest.class);
 
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextInstantiationTest.java
index ba402da24..d635be441 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextInstantiationTest.java
@@ -40,9 +40,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestContextInstantiation {
+public class ContextInstantiationTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextInstantiation.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ContextInstantiationTest.class);
 
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextUpdateTest.java
index 8ef8bf005..0eaf591e3 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextUpdateTest.java
@@ -41,9 +41,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestContextUpdate {
+public class ContextUpdateTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextUpdate.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ContextUpdateTest.class);
     
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiationTest.java
index d1cdc6d97..21ab6ef9e 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiationTest.java
@@ -40,9 +40,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestSequentialContextInstantiation {
+public class SequentialContextInstantiationTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestSequentialContextInstantiation.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(SequentialContextInstantiationTest.class);
 
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/ConcurrentContextTest.java
index ed9aff0c1..7274f0d57 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/ConcurrentContextTest.java
@@ -50,10 +50,10 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestConcurrentContext {
+public class ConcurrentContextTest {
 
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestConcurrentContext.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ConcurrentContextTest.class);
 
     // Test parameters
     private static final int ALBUM_SIZE = 16;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/PersistentContextInstantiationTest.java
index a659326a0..6bd4a4d41 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/PersistentContextInstantiationTest.java
@@ -62,7 +62,7 @@ import org.onap.policy.common.parameters.ParameterService;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestPersistentContextInstantiation {
+public class PersistentContextInstantiationTest {
     // Logger for this class
     // private static final XLogger logger =
     // XLoggerFactory.getXLogger(TestPersistentContextInstantiation.class);
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAadmDbWrite.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmDbWriteTest.java
index bbcbaab03..1cc379938 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAadmDbWrite.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmDbWriteTest.java
@@ -31,7 +31,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 TestAadmDbWrite {
+public class AadmDbWriteTest {
     private Connection connection;
     TestApexModel<AxPolicyModel> testApexModel;
 
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAadmModel.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
index 1ac1e9829..b0aa23949 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAadmModel.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
@@ -34,7 +34,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 TestAadmModel {
+public class AadmModelTest {
     private Connection connection;
     TestApexModel<AxPolicyModel> testApexModel;
 
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAadmUseCase.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
index 579bf3484..fbab071b6 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAadmUseCase.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
@@ -55,8 +55,8 @@ import org.slf4j.ext.XLoggerFactory;
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  *
  */
-public class TestAadmUseCase {
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestAadmUseCase.class);
+public class AadmUseCaseTest {
+    private static final XLogger logger = XLoggerFactory.getXLogger(AadmUseCaseTest.class);
 
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionDbWrite.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionDbWriteTest.java
index 8f54bf12f..885704497 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionDbWrite.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionDbWriteTest.java
@@ -31,7 +31,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 TestAnomalyDetectionDbWrite {
+public class AnomalyDetectionDbWriteTest {
     private Connection connection;
     TestApexModel<AxPolicyModel> testApexModel;
 
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionModel.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
index 9e631ef2e..552ca2f37 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionModel.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
@@ -34,7 +34,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 TestAnomalyDetectionModel {
+public class AnomalyDetectionModelTest {
     private Connection connection;
     TestApexModel<AxPolicyModel> testApexModel;
 
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionTslUseCase.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java
index c29a3cb6e..40df82cdb 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionTslUseCase.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java
@@ -57,8 +57,8 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author John Keeney (John.Keeney@ericsson.com)
  */
-public class TestAnomalyDetectionTslUseCase {
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestAnomalyDetectionTslUseCase.class);
+public class AnomalyDetectionTslUseCaseTest {
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(AnomalyDetectionTslUseCaseTest.class);
 
     private static final int MAXITERATIONS = 3660;
     private static final Random RAND = new Random(System.currentTimeMillis());
@@ -228,6 +228,6 @@ public class TestAnomalyDetectionTslUseCase {
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static void main(final String[] args) throws ApexException, InterruptedException, IOException {
-        new TestAnomalyDetectionTslUseCase().testAnomalyDetectionTslmain();
+        new AnomalyDetectionTslUseCaseTest().testAnomalyDetectionTslmain();
     }
 }
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnDbWrite.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnDbWriteTest.java
index d4c1ab193..828a56133 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnDbWrite.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnDbWriteTest.java
@@ -31,7 +31,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 TestAutoLearnDbWrite {
+public class AutoLearnDbWriteTest {
     private Connection connection;
     TestApexModel<AxPolicyModel> testApexModel;
 
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnModel.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
index 9bf7ce57a..f4cddc580 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnModel.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
@@ -34,7 +34,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 TestAutoLearnModel {
+public class AutoLearnModelTest {
     private Connection connection;
     TestApexModel<AxPolicyModel> testApexModel;
 
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnTslUseCase.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java
index 10d69a457..bf6c08f16 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnTslUseCase.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java
@@ -56,8 +56,8 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author John Keeney (John.Keeney@ericsson.com)
  */
-public class TestAutoLearnTslUseCase {
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestAutoLearnTslUseCase.class);
+public class AutoLearnTslUseCaseTest {
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(AutoLearnTslUseCaseTest.class);
 
     private static final int MAXITERATIONS = 1000;
     private static final Random rand = new Random(System.currentTimeMillis());
@@ -251,6 +251,6 @@ public class TestAutoLearnTslUseCase {
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static void main(final String[] args) throws ApexException, InterruptedException, IOException {
-        new TestAutoLearnTslUseCase().testAutoLearnTslMain();
+        new AutoLearnTslUseCaseTest().testAutoLearnTslMain();
     }
 }
diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpLogic.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java
index e425088ff..f19e2c8c3 100644
--- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpLogic.java
+++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java
@@ -41,7 +41,7 @@ import org.onap.policy.common.utils.resources.ResourceUtils;
 /**
  * The Class TestMfpLogic.
  */
-public class TestMfpLogic {
+public class MfpLogicTest {
 
     private static final Map<String, String> LOGICEXTENSIONS = new LinkedHashMap<>();
 
diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModelCli.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java
index a63df03bc..ce78b7671 100644
--- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModelCli.java
+++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java
@@ -36,7 +36,7 @@ import org.onap.policy.apex.model.utilities.TextFileUtils;
 /**
  * Test MyFirstPolicyModel CLI.
  */
-public class TestMfpModelCli {
+public class MfpModelCliTest {
     private static AxPolicyModel testApexModel1;
     private static AxPolicyModel testApexModel2;
 
diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModel.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelTest.java
index 808da4866..d6ec2bb8d 100644
--- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModel.java
+++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelTest.java
@@ -38,7 +38,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
  *
  * @author John Keeney (john.keeney@ericsson.com)
  */
-public class TestMfpModel {
+public class MfpModelTest {
 
     private static Connection connection;
     private static TestApexModel<AxPolicyModel> testApexModel1;
diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpUseCase.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
index 8c95c9fec..1b9a5a5c7 100644
--- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpUseCase.java
+++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
@@ -57,7 +57,7 @@ import org.onap.policy.common.utils.resources.ResourceUtils;
 /**
  * Test MyFirstPolicy Use Case.
  */
-public class TestMfpUseCase {
+public class MfpUseCaseTest {
     // CHECKSTYLE:OFF: MagicNumber
 
     private static ApexEngineImpl apexEngine;
diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSim.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSim.java
index bb754d99f..93b587a41 100644
--- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSim.java
+++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSim.java
@@ -39,7 +39,7 @@ public class AaiAndGuardSim {
      * Instantiates a new aai and guard sim.
      */
     public AaiAndGuardSim() {
-        final ResourceConfig rc = new ResourceConfig(AaiAndGuardSimEndpoint.class);
+        final ResourceConfig rc = new ResourceConfig(AaiAndGuardSimEndpointTest.class);
         server = GrizzlyHttpServerFactory.createHttpServer(URI.create(BASE_URI), rc);
 
         while (!server.isStarted()) {
diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSimEndpoint.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSimEndpointTest.java
index e36ef4d11..5b9040f95 100644
--- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSimEndpoint.java
+++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AaiAndGuardSimEndpointTest.java
@@ -38,7 +38,7 @@ import javax.ws.rs.core.Response;
  * The Class AaiAndGuardSimEndpoint.
  */
 @Path("/sim")
-public class AaiAndGuardSimEndpoint {
+public class AaiAndGuardSimEndpointTest {
 
     private static int postMessagesReceived = 0;
     private static int putMessagesReceived = 0;
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestAxKeyInfo.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java
index f615d9db9..3f1635cce 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestAxKeyInfo.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 
-public class TestAxKeyInfo {
+public class AxKeyInfoTest {
 
     @Test
     public void testAxKeyInfo() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestAxReferenceKey.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java
index 79f3984c3..68be4cdbb 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestAxReferenceKey.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java
@@ -32,7 +32,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 
-public class TestAxReferenceKey {
+public class AxReferenceKeyTest {
 
     @Test
     public void testAxReferenceKey() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestExceptions.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java
index 7a980d5f6..0c62a0376 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestExceptions.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java
@@ -31,7 +31,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 
-public class TestExceptions {
+public class ExceptionsTest {
 
     @Test
     public void test() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestKeyUse.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/KeyUseTest.java
index 6b5346971..65df26d65 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestKeyUse.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/KeyUseTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxKeyUse;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 
-public class TestKeyUse {
+public class KeyUseTest {
 
     @Test
     public void test() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestValidation.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java
index cfa4d0ded..f30babe91 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/TestValidation.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java
@@ -32,7 +32,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationMessage;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.ValidationResult;
 
-public class TestValidation {
+public class ValidationTest {
 
     @Test
     public void test() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/TestDaoMisc.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/DaoMiscTest.java
index 7966e8d4f..197c4b206 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/TestDaoMisc.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/dao/DaoMiscTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.dao.converters.CDataConditioner;
 import org.onap.policy.apex.model.basicmodel.dao.converters.Uuid2String;
 
-public class TestDaoMisc {
+public class DaoMiscTest {
 
     @Test
     public void testUuid2StringMopUp() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestApexBasicModelConcepts.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexBasicModelConceptsTest.java
index 11cab6d88..f2076c6e4 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestApexBasicModelConcepts.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexBasicModelConceptsTest.java
@@ -43,7 +43,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat
 import org.onap.policy.apex.model.basicmodel.service.ModelService;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 
-public class TestApexBasicModelConcepts {
+public class ApexBasicModelConceptsTest {
     TestApexModel<AxModel> testApexModel;
 
     @Before
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestApexBasicModel.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexBasicModelTest.java
index 69942b3df..e8c8ef154 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestApexBasicModel.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexBasicModelTest.java
@@ -36,7 +36,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
 import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 
-public class TestApexBasicModel {
+public class ApexBasicModelTest {
     private Connection connection;
     TestApexModel<AxModel> testApexModel;
 
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestBasicModelTest.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/BasicModelTest.java
index 905f9e16b..9881c7355 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestBasicModelTest.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/BasicModelTest.java
@@ -29,7 +29,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 
-public class TestBasicModelTest {
+public class BasicModelTest {
 
     @Test
     public void testNormalModelCreator() throws ApexException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestConceptGetter.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ConceptGetterTest.java
index f95c0b41d..5dfd6711b 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestConceptGetter.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ConceptGetterTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelFileWriter;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader;
 
-public class TestConceptGetter {
+public class ConceptGetterTest {
 
     @Test
     public void testConceptGetter() throws IOException, ApexException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestExceptions.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ExceptionsTest.java
index 8b0196b31..8715cabe5 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestExceptions.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ExceptionsTest.java
@@ -28,7 +28,7 @@ import java.io.IOException;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
 
-public class TestExceptions {
+public class ExceptionsTest {
 
     @Test
     public void test() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelFileWriter.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelFileWriterTest.java
index 3e860e3b1..9a894e86b 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelFileWriter.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelFileWriterTest.java
@@ -31,7 +31,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelFileWriter;
 
-public class TestModelFileWriter {
+public class ModelFileWriterTest {
 
     @Test
     public void testModelFileWriter() throws IOException, ApexException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelReader.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelReaderTest.java
index 1695a0b2c..e4e33460e 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelReader.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelReaderTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelWriter;
 
-public class TestModelReader {
+public class ModelReaderTest {
 
     @Test
     public void testModelReader() throws IOException, ApexException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelSaver.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelSaverTest.java
index 634a929d9..b318fc7af 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelSaver.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelSaverTest.java
@@ -30,7 +30,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelSaver;
 
-public class TestModelSaver {
+public class ModelSaverTest {
 
     @Test
     public void testModelSaver() throws IOException, ApexException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelStringWriter.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelStringWriterTest.java
index d187e55ee..a44387559 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelStringWriter.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelStringWriterTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelStringWriter;
 
-public class TestModelStringWriter {
+public class ModelStringWriterTest {
 
     @Test
     public void testModelStringWriter() throws IOException, ApexException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelWriter.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelWriterTest.java
index 57c30db11..f79b4e4c6 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestModelWriter.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ModelWriterTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxModel;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelWriter;
 
-public class TestModelWriter {
+public class ModelWriterTest {
 
     @Test
     public void testModelWriter() throws IOException, ApexException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestSchemaGenerator.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SchemaGeneratorTest.java
index 36e4125ec..5950f1acc 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/TestSchemaGenerator.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SchemaGeneratorTest.java
@@ -31,7 +31,7 @@ import java.io.PrintStream;
 
 import org.junit.Test;
 
-public class TestSchemaGenerator {
+public class SchemaGeneratorTest {
 
     @Test
     public void test() throws IOException {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/TestModelService.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java
index 4f05de177..f1bb220b3 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/TestModelService.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation;
 import org.onap.policy.apex.model.basicmodel.handling.TestApexBasicModelCreator;
 
-public class TestModelService {
+public class ModelServiceTest {
 
     @Test
     public void testModelService() {
diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/xml/TestAxReferenceKeyAdapter.java b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapterTest.java
index a7773c37c..2befe3336 100644
--- a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/xml/TestAxReferenceKeyAdapter.java
+++ b/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapterTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 import org.onap.policy.apex.model.basicmodel.xml.AxReferenceKeyAdapter;
 
-public class TestAxReferenceKeyAdapter {
+public class AxReferenceKeyAdapterTest {
 
     @Test
     public void test() throws Exception {
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextAlbums.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
index 6ba0b2fa6..eb0db0da7 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextAlbums.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestContextAlbums {
+public class ContextAlbumsTest {
 
     @Test
     public void testContextAlbums() {
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextModel.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
index 290183e5f..fbf97881f 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextModel.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
@@ -38,7 +38,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestContextModel {
+public class ContextModelTest {
 
     @Test
     public void test() {
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextSchemas.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
index a8dde7781..73f4c3086 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextSchemas.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
 /**
  * Context schema tests.
  */
-public class TestContextSchemas {
+public class ContextSchemasTest {
 
     @Test
     public void testContextSchemas() {
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModel.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java
index 94a36844f..948c2024c 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModel.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
  * @author liam
  *
  */
-public class TestApexContextModel {
+public class ApexContextModelTest {
     private Connection connection;
     TestApexModel<AxContextModel> testApexModel;
 
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparison.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
index 65295c13b..81609cacf 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparison.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestContextComparison {
+public class ContextComparisonTest {
     private AxContextModel emptyModel;
     private AxContextModel fullModel;
     private AxContextModel noGlobalContextModel;
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineModel.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java
index 2c1ab4bff..392bdd53b 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineModel.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
  * Test engine models.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestEngineModel {
+public class EngineModelTest {
 
     @Test
     public void testEnginetModel() {
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineStats.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java
index 8bd5756ab..86a8c4763 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/TestEngineStats.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult.Validat
  * Test engine statistics.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestEngineStats {
+public class EngineStatsTest {
     private static final Object WAIT_LOCK = new Object();
 
     @Test
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModel.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
index 10abbf3fe..32c4ff38b 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModel.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
@@ -34,7 +34,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.enginemodel.concepts.AxEngineModel;
 
-public class TestApexEngineModel {
+public class ApexEngineModelTest {
     private Connection connection;
     TestApexModel<AxEngineModel> testApexModel;
 
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
index a5d3a349a..74f092a94 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
  * Test event models.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestEventModel {
+public class EventModelTest {
 
     @Test
     public void testEventModel() {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
index 36ef6ade5..4a17c2a48 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
@@ -43,7 +43,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxField;
  * Test events.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestEvents {
+public class EventsTest {
 
     @Test
     public void testEvents() {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
index 75fced1b0..3d88b4c81 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxOutputField;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestField {
+public class FieldTest {
 
     @Test
     public void testField() {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
index 643bdfaa2..aaed3cd7f 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
@@ -34,7 +34,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.eventmodel.concepts.AxEventModel;
 
-public class TestApexEventModel {
+public class ApexEventModelTest {
     private Connection connection;
     TestApexModel<AxEventModel> testApexModel;