Collapse apex-pdp maven model submodules

This review collapses all the code in six podel submodules into a single
model module. There are no code changes, just files moved around.

This change reduces the complexity of the code structure and speeds up
the build.

Issue-ID: POLICY-1820
Change-Id: Ifb644e8ec85ae6d0987378f4616fbc8a8858a9a8
Signed-off-by: liamfallon <liam.fallon@est.tech>

11 files changed, 0 insertions, 2628 deletions

diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java
deleted file mode 100644
index 3c2af18ea..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Arrays;
-import org.junit.Test;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-
-/**
- * Test API results.
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexApiResultTest {
-
-    @Test
-    public void testApiResult() {
-        assertNotNull(new ApexApiResult());
-
-        for (final Result result : Result.values()) {
-            assertNotNull(new ApexApiResult(result));
-        }
-
-        assertNotNull(new ApexApiResult(Result.SUCCESS, "Result Message"));
-        assertNotNull(new ApexApiResult(Result.FAILED, new IOException("IO Exception message")));
-        assertNotNull(new ApexApiResult(Result.FAILED, "Result Message", new IOException("IO Exception message")));
-
-        final ApexApiResult result =
-                new ApexApiResult(Result.FAILED, "Result Message", new IOException("IO Exception message"));
-
-        assertFalse(result.isOk());
-        assertTrue(result.isNok());
-        assertEquals(Result.FAILED, result.getResult());
-        assertEquals("Result Message\nIO Exception message\njava.io.IOExce", result.getMessage().substring(0, 50));
-
-        final ApexApiResult result2 = new ApexApiResult(Result.SUCCESS);
-        result2.addMessage(null);
-        assertEquals("", result2.getMessage());
-        result2.addMessage("");
-        assertEquals("", result2.getMessage());
-        result2.addMessage("funky message");
-        assertEquals("funky message\n", result2.getMessage());
-
-        result2.setResult(Result.OTHER_ERROR);
-        assertEquals(Result.OTHER_ERROR, result2.getResult());
-
-        final String[] messages = {"First Message", "Second Message", "Third Message"};
-        result2.setMessages(Arrays.asList(messages));
-        assertEquals("First Message", result2.getMessages().get(0));
-        assertEquals("Second Message", result2.getMessages().get(1));
-        assertEquals("Third Message", result2.getMessages().get(2));
-
-        assertEquals("result: OTHER_ERROR\nFirst Message\nSecond Message\nThird Message\n", result2.toString());
-        assertEquals("{\n" + "\"result\": \"OTHER_ERROR\",\n" + "\"messages\": [\n" + "\"First Message\",\n"
-                + "\"Second Message\",\n" + "\"Third Message\"]\n" + "}\n", result2.toJson());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
deleted file mode 100644
index 5ce6b6760..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Context album for API tests.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorApiContextAlbumTest {
-    @Test
-    public void testContextAlbumCrud() {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.validateContextAlbum(null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.validateContextAlbum("%%%$£", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createContextAlbum("MyMap002", "0.0.2", "APPLICATION", "true", "MapType", "0.0.1",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", "0.1.2", "ZOOBY", "false", "MapType", "0.0.1",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 012");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", "0.1.4", "UNDEFINED", null, "MapType", "0.0.1",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 014");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "+++", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapZooby", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", "--++", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", null, "EPHEMERAL", "false", "MapType", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createContextAlbum("MyMap002", "0.0.2", "APPLICATION", "true", "MapType", null,
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createContextAlbum("MyMap011", "0.1.2", "APPLICATION", "true", "MapType", "0.0.1",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.deleteContextAlbum("MyMap012", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextAlbum("MyMap012", "0.1.2", "ZOOBY", "false", "MapType", "0.0.1",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 012");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.validateContextAlbum(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateContextAlbum(null, null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap002", "0.0.2", null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap002", "0.0.2", "ZOOBY", "true", null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap002", "0.0.2", null, null, null, null,
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, null, "true", null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap015", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap014", "0.1.5", null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "StringType", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "String", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "StringType", "0.0.2", null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "false", "StringType", "0.0.1", null,
-            null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextAlbum("MyMap012", null, "APPLICATION", "Hello", "StringType", "0.0.1", null,
-            null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listContextAlbum("@£%%$", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.listContextAlbum(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listContextAlbum("MyMap012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listContextAlbum("MyMap012", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listContextAlbum("MyMap012", "0.2.5");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listContextAlbum("MyMap014", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteContextAlbum("@£%%$", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deleteContextAlbum("MyMap012", "0.1.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteContextAlbum("MyMap012oooo", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listContextAlbum("MyMap012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(3, result.getMessages().size());
-
-        result = apexModel.deleteContextAlbum("MyMap012", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listContextAlbum("MyMap012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.deleteContextAlbum("MyMap012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.listContextAlbum("MyMap012", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteContextAlbum(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-
-        result = apexModel.listContextAlbum(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(0, result.getMessages().size());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
deleted file mode 100644
index 20310a29e..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Context schema for API tests.
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorApiContextSchemaTest {
-    @Test
-    public void testContextSchemaCrud() {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.validateContextSchemas(null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.validateContextSchemas("%%%$£", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listContextSchemas(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createContextSchema("Hello", "0.0.2", "Java", "java.lang.String",
-                "1fa2e430-f2b2-11e6-bc64-92361f002671", "A description of hello");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextSchema("Hello", "0.1.2", "Java", "java.lang.String",
-                "1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of hola");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextSchema("Hello", "0.1.4", "Java", "java.lang.String",
-                "1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of connichi wa");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextSchema("Hello", null, "Java", "java.lang.String", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextSchema("Hello", null, "Java", "java.lang.String", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.deleteContextSchema("Hello", "0.1.4");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextSchema("Hello", "0.1.4", "Java", "java.lang.String",
-                "1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of connichi wa");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createContextSchema("Hello2", null, null, "java.lang.String", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextSchema("Hello2", null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createContextSchema("Hello2", null, "Java", "java.lang.String", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createContextSchema("Hello", "0.1.2", "Java", "java.lang.Float",
-                "1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of hola");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.deleteContextSchema("Hello", "0.1.4");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createContextSchema("Hello", "0.1.4", "Java", "java.lang.String",
-                "1fa2e430-f2b2-11e6-bc64-92361f002672", "A description of connichi wa");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.validateContextSchemas(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateContextSchema(null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.updateContextSchema("Hello", "0.0.2", null, null, null, "An updated description of hello");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextSchema("Hello", "0.0.2", null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateContextSchema("Hello", "0.1.2", "Java", "java.lang.Integer",
-                "1fa2e430-f2b2-11e6-bc64-92361f002673", "A further updated description of hola");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateContextSchema("Hello2", "0.0.2", null, null, null, "An updated description of hello");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listContextSchemas("@£%%$", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.listContextSchemas("Hello", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.listContextSchemas("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-
-        result = apexModel.listContextSchemas(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(9, result.getMessages().size());
-
-        result = apexModel.deleteContextSchema("@£%%$", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deleteContextSchema("Hello", "0.1.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteContextSchema("Hellooooo", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listContextSchemas("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-
-        result = apexModel.deleteContextSchema("Hello", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listContextSchemas("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(3, result.getMessages().size());
-
-        result = apexModel.deleteContextSchema("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listContextSchemas("Hello", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listContextSchemas(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.deleteContextSchema(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(5, result.getMessages().size());
-
-        result = apexModel.listContextSchemas(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(0, result.getMessages().size());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
deleted file mode 100644
index ac9265e84..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- *  Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Test events for API tests.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorApiEventTest {
-    @Test
-    public void testEventCrud() {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.validateEvent(null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.validateEvent("%%%$£", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createEvent("MyEvent002", "0.0.2", "My Namespace", "My Source", "my target",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEvent("MyEvent012", "0.1.2", "My Namespace", "My Source", "my target",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEvent("MyEvent012", "0.1.4", "My Namespace", "My Source", "my target",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 014", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEvent("MyEvent012", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEvent("MyEvent012", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createEvent("MyEvent002", "0.0.2", "My Namespace", "My Source", "my target",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createEvent("@£$%^", "0.2.5", "My Namespace", "My Source", "my target",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deleteEvent("MyEvent012", "0.1.4");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEvent("MyEvent012", "0.1.4", "My Namespace", "My Source", "my target",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 014", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.validateEvent(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateEvent(null, null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result =
-            apexModel.updateEvent("MyEvent012", "0.1.2", "Another Namespace", null, "Another target", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateEvent("MyEvent002", "0.0.2", "My Namespace", "My Source", "my target",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateEvent("MyEvent012", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateEvent("MyEvent015", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateEvent("MyEvent014", "0.1.5", null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateEvent("@£$%^^", "0.6.9", null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.listEvent("@£$%", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listEvent(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEvent("MyEvent012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEvent("MyEvent012", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEvent("MyEvent012", "0.2.5");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listEvent("MyEvent123", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteEvent("@£$%^", "0.1.1");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deleteEvent("MyEvent012", "0.1.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteEvent("MyEvent012oooo", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listEvent("MyEvent012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(3, result.getMessages().size());
-
-        result = apexModel.deleteEvent("MyEvent012", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listEvent("MyEvent012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.deleteEvent("MyEvent012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listEvent("MyEvent012", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createEventPar("MyEvent123", null, "NewPar00", null, null, false);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createEventPar("MyEvent002", "4.5.6", "NewPar00", null, null, true);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createEventPar("MyEvent002", "0.1.4", "NewPar00", null, null, false);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar00", null, null, true);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.createContextSchema("eventContextItem0", "0.0.1", "Java", "java.lang.Integer",
-            "1fa2e430-f2b2-11e6-bc64-92361f002673", "A further updated description of hola");
-        result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar00", "eventContextItem0", null, false);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar00", "eventContextItem0", null, true);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar01", "eventContextItem0", "0.0.1", false);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEventPar("MyEvent002", "0.0.2", "NewPar02", "eventContextItem0", "0.0.2", true);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createEventPar("MyEvent002", null, "NewPar02", "eventContextItem0", null, false);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createEventPar("MyEvent002", null, "NewPar03", "eventContextItem0", null, true);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listEventPar("@£%%$", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", "0.0.1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", "0.0.2", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", "0.0.2", "NewPar01");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", "0.0.2", "NewPar02");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteEventPar("@££%%%", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deleteEventPar("NonExistantEvent", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(4, apexModel.listEventPar("MyEvent002", null, null).getMessages().size());
-        result = apexModel.deleteEventPar("MyEvent002", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(4, apexModel.listEventPar("MyEvent002", null, null).getMessages().size());
-        result = apexModel.deleteEventPar("MyEvent002", null, "NewPar02");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(3, apexModel.listEventPar("MyEvent002", null, null).getMessages().size());
-        result = apexModel.deleteEventPar("MyEvent002", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deleteEventPar("MyEvent002", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listEventPar("MyEvent002", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteEvent(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-
-        result = apexModel.listEvent(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(0, result.getMessages().size());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
deleted file mode 100644
index 2519b8cb2..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Key information for API tests.
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorApiKeyInfoTest {
-
-    @Test
-    public void testKeyInfoCrud() {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.validateKeyInformation(null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.validateKeyInformation("%%%$£", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createKeyInformation(null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.createKeyInformation("Hello", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002671",
-                "A description of hello");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createKeyInformation("Hello", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002672",
-                "A description of hola");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createKeyInformation("Hello", "0.1.4", "1fa2e430-f2b2-11e6-bc64-92361f002672",
-                "A description of connichi wa");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createKeyInformation("Hello", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createKeyInformation("Hello", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.createKeyInformation("Hello", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002672",
-                "A description of hola");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.validateKeyInformation(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateKeyInformation(null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.updateKeyInformation("Hello", "0.0.2", null, "An updated description of hello");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateKeyInformation("Hello", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateKeyInformation("Hello", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002673",
-                "A further updated description of hola");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateKeyInformation("Hello2", "0.0.2", null, "An updated description of hello");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listKeyInformation(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listKeyInformation("%%%$$", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.listKeyInformation("Hello", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.listKeyInformation("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-
-        result = apexModel.deleteKeyInformation("Hello", "0.1.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteKeyInformation("Hellooooo", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listKeyInformation("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-
-        result = apexModel.listKeyInformation(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(22, result.getMessages().size());
-
-        result = apexModel.deleteKeyInformation("%%%$$", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deleteKeyInformation("Hello", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listKeyInformation("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(3, result.getMessages().size());
-
-        result = apexModel.deleteKeyInformation("Hello", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listKeyInformation("Hello", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteKeyInformation(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(18, result.getMessages().size());
-
-        result = apexModel.listKeyInformation(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(0, result.getMessages().size());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
deleted file mode 100644
index 0a4d72214..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
+++ /dev/null
@@ -1,1023 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * Test policies for API.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorApiPolicyTest {
-    @Test
-    public void testMyTestPolicyCrud() {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.validatePolicy(null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.validatePolicy("%%%$£", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicy("MyPolicy012", null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicy("MyPolicy012", null, "SomeTemplate", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicy("MyPolicy013", null, null, "AState", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicy("MyPolicy012", null, "SomeTemplate", "AState", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicy("MyPolicy012", "0.1.2", "SomeTemplate", "AState",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicy("MyTestPolicy", "0.0.1", "SomeTemplate", "TestState",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.deletePolicy("MyPolicy002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicy("MyPolicy002", "0.0.2", "SomeTemplate", "AState",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.validatePolicy(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updatePolicy("@£$$", "0.0.2", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy002", "0.0.2", null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy002", "0.0.1", null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy002", "0.0.2", "SomeOtherTemplate", "BState",
-            "1fa2e430-f2b2-11e6-bc64-92361f002700", "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy012", null, "SomeOtherTemplate", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy012", null, null, "CState", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy012", null, "SomeOtherTemplate", "BState", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy015", null, "SomeOtherTemplate", "DState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicy("MyPolicy014", "0.1.5", "SomeOtherTemplate", "EState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listPolicy("@£$%%", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicy(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(6, result.getMessages().size());
-        result = apexModel.listPolicy("MyPolicy012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listPolicy("MyPolicy012", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicy("MyPolicy012", "0.2.5");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicy("MyPolicy014", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deletePolicy("@£$%", "0.1.1");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deletePolicy("MyPolicy012", "0.1.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deletePolicy("MyPolicy012oooo", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listPolicy("MyPolicy012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.deletePolicy("MyPolicy002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-
-        result = apexModel.listPolicy("MyPolicy012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.deletePolicy("MyPolicy012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.createPolicyState(null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyState("MyPolicy123", null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyState("MyPolicy123", null, "AState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.2", "AState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "ATrigger", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "ATask", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "AState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "BState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "CState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "DState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updatePolicyState(null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyState("MyPolicy123", null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyState("MyPolicy123", null, "AState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", "0.0.2", "AState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "ZState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "ATrigger", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "ATask", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", null, "AState", "inEvent", null, "task", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "AState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "BState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "CState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyState("MyTestPolicy", "0.0.1", "DState", "inEvent", "0.0.1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listPolicyState("MyTestPolicy", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-        result = apexModel.listPolicyState(null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyState("SomeOtherPolicy", "0.0.1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyState("SomeOtherPolicy", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyState("MyTestPolicy", "0.0.2", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-        result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", "CState");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyState("MyTestPolicy", null, "CState");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", "AState");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyState("MyTestPolicy", "0.0.1", "EState");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deletePolicyState("@£$$", "0.0.2", "Trigger04");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        assertEquals(4, apexModel.listPolicyState("MyTestPolicy", null, null).getMessages().size());
-        result = apexModel.deletePolicyState("MyTestPolicy", "0.0.2", "Trigger04");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(4, apexModel.listPolicyState("MyTestPolicy", null, null).getMessages().size());
-        result = apexModel.deletePolicyState("MyTestPolicy", null, "CState");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyState("MyTestPolicy", null, "ZState");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(3, apexModel.listPolicyState("MyTestPolicy", null, null).getMessages().size());
-        result = apexModel.deletePolicyState("MyTestPolicy", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listPolicyState("MyTestPolicy", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyState("MyTestPolicy", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "TestState1", "inEvent", "0.0.1", "task",
-            "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "TestState2", "outEvent0", "0.0.1", "task",
-            "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createPolicyState("MyTestPolicy", "0.0.1", "TestState3", "outEvent1", "0.0.1", "task",
-            "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createPolicyStateTaskSelectionLogic(null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "1.2.3", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "NewTSL00", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "UNDEFINED",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "MVEL",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "JAVA",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "JYTHON",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", "JAVASCRIPT",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", "JRUBY",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updatePolicyStateTaskSelectionLogic(null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState99", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy2", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy1", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "NonExistantState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "",
-            "Some Other Policy Logic");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1", "MVEL",
-            "Some Other Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyPolicy012", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null,
-            "Some Other Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyPolicy015", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyPolicy014", "0.1.5", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listPolicyStateTaskSelectionLogic(null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("zooby", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("zooby", null, "looby");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("zooby", null, "TestState1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "looby");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.2", "TestState1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-
-        result = apexModel.deletePolicyStateTaskSelectionLogic(null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("zooby", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("zooby", null, "looby");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("zooby", null, "TestState1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", null, "looby");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.2", "TestState1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", null,
-            "Some Other Policy Logic");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.createPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1", "JRUBY",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listPolicyStateTaskSelectionLogic("MyTestPolicy", null, "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateTaskSelectionLogic("MyTestPolicy", "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createPolicyStateOutput(null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", null, "SomeState", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", null, "SomeState", "SomeOutput", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "1.2.3", "TestState1", "SomeOutput", null, null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", null, null,
-            null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput",
-            "SomeDummyEvent", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
-            "1.2.3", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
-            "0.0.1", "SomeDummyNextState");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
-            "0.0.1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
-            "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
-            "0.0.1", "TestState2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
-            "0.0.1", "TestState2");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "AnotherOtherOutput",
-            "outEvent0", "0.0.1", "TestState3");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "YetAnotherOtherOutput",
-            "outEvent0", "0.0.1", "TestState3");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listPolicyStateOutput(null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.2", "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "SomeState", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "YetAnotherOtherOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "YetAnotherOtherOutput");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState3", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deletePolicyStateOutput(null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.2", "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "SomeState", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", "TestState3", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", "0.0.1", "TestState3", "DummyOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState1", null);
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "TestState1", "SomeOutput");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState2", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.deletePolicyStateOutput("MyTestPolicy", null, "TestState2", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listPolicyStateOutput("MyTestPolicy", null, "TestState2", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOutput", "inEvent",
-            "0.0.1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
-            "0.0.1", "TestState1");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState1", "SomeOtherOutput", "inEvent",
-            "0.0.1", "TestState2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "AnotherOtherOutput",
-            "outEvent0", "0.0.1", "TestState3");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateOutput("MyTestPolicy", "0.0.1", "TestState2", "YetAnotherOtherOutput",
-            "outEvent0", "0.0.1", "TestState3");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createPolicyStateFinalizerLogic(null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", "SFLName01", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "1.2.3", "TestState1", "SFLName01", null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName01", null,
-            null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName01",
-            "NewTSL00", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02",
-            "UNDEFINED", "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName03", "MVEL",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName03", "MVEL",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName04", "JAVA",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName05", "JYTHON",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06",
-            "JAVASCRIPT", "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName07", "JRUBY",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updatePolicyStateFinalizerLogic(null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState99", "SomeSFLName", null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy2", null, "TestState1", "SomeSFLName", null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy1", "0.0.2", "TestState1", "SomeSFLName", null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "NonEistantSFL", null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06", null,
-            null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06", "",
-            "Some Other Policy Logic");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06", "MVEL",
-            "Some Other Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyPolicy012", null, "TestState1", "SFLName06", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06", null,
-            "Some Other Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyPolicy015", null, "TestState1", "SFLName06", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updatePolicyStateFinalizerLogic("MyPolicy014", "0.1.5", "TestState1", "SFLName06", null,
-            null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listPolicyStateFinalizerLogic(null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("zooby", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("zooby", null, "looby", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("zooby", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "looby", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(6, result.getMessages().size());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-
-        result = apexModel.deletePolicyStateFinalizerLogic(null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", null, "SomeState", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("zooby", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("zooby", null, "looby", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("zooby", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", null, "looby", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.2", "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName06");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(5, result.getMessages().size());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName02");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-        result = apexModel.deletePolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName02",
-            "UNDEFINED", "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName03", "MVEL",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName04", "JAVA",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", "0.0.1", "TestState1", "SFLName05", "JYTHON",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName06",
-            "JAVASCRIPT", "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateFinalizerLogic("MyTestPolicy", null, "TestState1", "SFLName07", "JRUBY",
-            "Some Policy Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createTask("TestTask0", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTask("TestTask1", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTask("TestTask2", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTask("TestTask3", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTask("TestTask4", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createPolicyStateTaskRef(null, null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, null, null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null, null, null,
-            "DummyOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "1.2.3", "SomeState", null, null, null, null,
-            "DummyOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("AnyOldPolicy", "1.2.3", "SomeState", null, null, null, null,
-            "DummyOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", null,
-            null, null, "DummyOutput");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName",
-            "SomeTask", "Zooby|", null, "DummyOutput");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName",
-            "SomeTask", "0.0.1", null, "DummyOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", null, "DummyOutput");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", "Some Policy Logic", "DummyOutput");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", "DIRECT", "DummyOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", "LOGIC", "DummyOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", "DIRECT", "SFLName07");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", "LOGIC", "SomeOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", "DIRECT", "SomeOutput");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "NonExistantTask", "0.0.1", "DIRECT", "SomeOutput");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName", "task",
-            "0.0.1", "LOGIC", "SFLName07");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "TestTask0", "0.0.1", "LOGIC", "SFLName07");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "TestTask1", "0.0.1", "DIRECT", "SomeOtherOutput");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "TestTask2", "0.0.1", "LOGIC", "SFLName07");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "TestTask3", "0.0.1", "DIRECT", "SomeOtherOutput");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, "TestTask4", "0.0.1",
-            "LOGIC", "SFLName07");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, "TestTask4", "0.0.1",
-            "LOGIC", "SFLName07");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", "TestTask4", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "TestTask4", "0.0.1", "FUNKY", "SFLName07");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "TestTask4", "0.0.1", "UNDEFINED", "SFLName07");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeTaskLocalName",
-            "TestTask4", "0.0.1", "LOGIC", "SFLName07");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, "TestTask0", "0.0.1",
-            "LOGIC", "SFLName07");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.listPolicyStateTaskRef(null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("zooby", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("zooby", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("zooby", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(12, result.getMessages().size());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "SomeOldTask", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "task", "1.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", "task", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.deletePolicyStateTaskRef(null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("zooby", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("zooby", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("zooby", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "ADummyTask", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", "0.0.1", "TestState1", "task", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(12, result.getMessages().size());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", "TestTask0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(10, result.getMessages().size());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", "TestTask2", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(8, result.getMessages().size());
-        result = apexModel.deletePolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(4, result.getMessages().size());
-        result = apexModel.listPolicyStateTaskRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createPolicyStateContextRef(null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "1.2.3", "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("AnyOldPolicy", "1.2.3", "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTask", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTask", "Zooby|");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "SomeTask", "0.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "task", "0.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyPolicy123", null, null, "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyPolicy123", null, "TestState1", "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "4.5.6", "TestState1", "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.1.4", "TestState1", "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.listPolicyStateContextRef(null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateContextRef("zooby", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateContextRef("zooby", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("zooby", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "AContextMap04", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "1.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deletePolicyStateContextRef(null, null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "SomeState", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("zooby", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("zooby", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("zooby", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "looby", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.2", "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "ADummyContextMap", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "AContextMap04", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum0", "0.1.5");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", "contextAlbum1", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.createPolicyStateContextRef("MyTestPolicy", "0.0.1", "TestState1", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deletePolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listPolicyStateContextRef("MyTestPolicy", null, "TestState1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deletePolicy(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(3, result.getMessages().size());
-
-        result = apexModel.listPolicy(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(0, result.getMessages().size());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
deleted file mode 100644
index 15e53f925..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- *  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.onap.policy.apex.model.modelapi.impl.ApexModelImpl;
-
-/**
- * Test tasks for API tests.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorApiTaskTest {
-    @Test
-    public void testTaskCrud() {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.validateTask(null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.validateTask("%%%$£", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.createTask("@^^$^^$", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
-            "A description of 002");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
-            "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
-            "A description of 002");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createTask("MyTask012", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTask("MyTask012", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.listTask(null, null);
-        result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
-            "A description of 002");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createTask("MyTask012", "0.1.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
-            "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.deleteTask("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
-            "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.validateTask(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateTask("@$$$£", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updateTask("MyTask002", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTask("MyTask002", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateTask("MyTask002", "0.0.2", "1fa2e430-f2b2-11e6-bc64-92361f002700",
-            "A description of 002");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTask("MyTask012", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTask("MyTask012", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTask("MyTask012", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTask("MyTask015", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateTask("MyTask014", "0.1.5", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listTask("£@£@@£@£", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listTask(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTask("MyTask012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTask("MyTask012", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTask("MyTask012", "0.2.5");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listTask("MyTask014", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteTask("@£££@", "0.1.1");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deleteTask("MyTask012", "0.1.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deleteTask("MyTask012oooo", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listTask("MyTask012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.deleteTask("MyTask012", "0.1.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listTask("MyTask012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-
-        result = apexModel.deleteTask("MyTask012", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.listTask("MyTask012", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.updateTaskLogic("MyTask002", null, "NewLogic00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createTaskLogic("MyTask123", null, "NewLogic00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", "4.5.6", "NewLogic00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", "0.1.4", "NewLogic00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", "0.0.2", "NewLogic00", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", "0.0.2", "UNDEFINED", "Some Task Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", "0.0.2", "MVEL", "Some Task Logic");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", "0.0.2", "JAVA", "Some Task Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", "0.0.2", "JYTHON", "Some Task Logic");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", null, "JAVASCRIPT", "Some Task Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskLogic("MyTask002", null, "JRUBY", "Some Task Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.updateTaskLogic("MyTask002", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask002", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask002", "0.0.2", "", "Some Other Task Logic");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask002", "0.0.2", "MVEL", "Some Other Task Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask012", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask002", null, null, "Some Other Task Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask002", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask015", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.updateTaskLogic("MyTask014", "0.1.5", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.listTaskLogic("MyTask002", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskLogic("MyTask002", "0.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskLogic(null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deleteTaskLogic("@£@£@£", "0.0.2");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deleteTaskLogic("NonExistantTask", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        assertEquals(1, apexModel.listTaskLogic("MyTask002", null).getMessages().size());
-        result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskLogic("MyTask002", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(1, apexModel.listTaskLogic("MyTask002", null).getMessages().size());
-        result = apexModel.createTaskLogic("MyTask002", null, "JRUBY", "Some Task Logic");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskLogic("MyTask002", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.deleteTaskLogic("MyTask002", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createTaskField("MyTask002", "0.0.2", "NewField00", "eventContextItem0", null, false);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(ApexModelImpl.FIELDS_DEPRECATED_WARN_MSG, result.getMessage().trim());
-        result = apexModel.handleTaskField("MyTask002", "0.0.2", "NewField01");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(ApexModelImpl.FIELDS_DEPRECATED_WARN_MSG, result.getMessage().trim());
-
-        result = apexModel.createTaskParameter("MyTask123", null, "NewPar00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createTaskParameter("MyTask002", "4.5.6", "NewPar00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createTaskParameter("MyTask002", "0.1.4", "NewPar00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar00", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar00", "eventContextItem0");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar00", "eventContextItem0");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar01", "eventContextItem0");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar02", "eventContextItem0");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar02", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createTaskParameter("MyTask002", "0.0.2", "NewPar03", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createTaskParameter("MyTask002", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createTaskParameter("MyTask002", null, null, "Default value");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.listTaskParameter("@£$%", null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listTaskParameter("MyTask002", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskParameter("MyTask002", "0.0.3", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listTaskParameter("MyTask002", "0.0.2", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskParameter("MyTask002", "0.0.2", "NewPar01");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskParameter("MyTask002", "0.0.2", "NewPar02");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskParameter("MyTask002", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteTaskParameter("@£$%", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deleteTaskParameter("NonExistantTask", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(3, apexModel.listTaskParameter("MyTask002", null, null).getMessages().size());
-        result = apexModel.deleteTaskParameter("MyTask002", "0.0.2", "NewPar04");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(3, apexModel.listTaskParameter("MyTask002", null, null).getMessages().size());
-        result = apexModel.deleteTaskParameter("MyTask002", null, "NewPar02");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, apexModel.listTaskParameter("MyTask002", null, null).getMessages().size());
-        result = apexModel.deleteTaskParameter("MyTask002", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.listTaskParameter("MyTask002", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deleteTaskParameter("MyTask002", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createTaskContextRef("@£$$", null, "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask123", null, "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask123", null, "AContextMap00", "0.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask123", null, "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "4.5.6", "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "0.1.4", "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "AContextMap00", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum2", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum1", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = apexModel.createTaskContextRef("MyTask002", null, "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.listTaskContextRef("@£$%", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.listTaskContextRef("MyTask002", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "AContextMap04", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum0", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum1", "0.0.1");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listTaskContextRef("MyTask002", "0.0.2", "contextAlbum1", "0.0.2");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteTaskContextRef("@£$%", "0.0.2", "AContextMap04", null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = apexModel.deleteTaskContextRef("NonExistantTask", "0.0.2", "AContextMap04", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        assertEquals(2, apexModel.listTaskContextRef("MyTask002", null, null, null).getMessages().size());
-        result = apexModel.deleteTaskContextRef("MyTask002", "0.0.2", "AContextMap04", null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deleteTaskContextRef("MyTask002", null, "contextAlbum0", "0.0.3");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deleteTaskContextRef("MyTask002", null, "contextAlbum0", "0.1.5");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = apexModel.deleteTaskContextRef("MyTask002", null, "contextAlbum0", null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.deleteTaskContextRef("MyTask002", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(1, result.getMessages().size());
-        result = apexModel.listTaskContextRef("MyTask002", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = apexModel.deleteTask(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(2, result.getMessages().size());
-
-        result = apexModel.listTask(null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertEquals(0, result.getMessages().size());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
deleted file mode 100644
index f28d0e634..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.util.UUID;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.policy.apex.model.modelapi.impl.ApexModelImpl;
-import org.onap.policy.common.utils.resources.TextFileUtils;
-
-/**
- * Test the apex model API.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexModelApiTest {
-    private Connection connection;
-
-    @Before
-    public void setup() throws Exception {
-        // Hold the h2 database up for entire tests
-        connection = DriverManager.getConnection("jdbc:h2:mem:testdb");
-    }
-
-    @After
-    public void teardown() throws Exception {
-        // Close the h2 database after tests
-        connection.close();
-    }
-
-    @Test
-    public void testApexModelLoadFromFile() {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.loadFromFile("src/main/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.junk");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        assertEquals("Unable to unmarshal Apex concept", result.getMessages().get(0).trim());
-    }
-
-    @Test
-    public void testApexModelSaveToFile() throws IOException {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        final File tempJsonModelFile = File.createTempFile("ApexModelTest", ".json");
-        result = apexModel.saveToFile(tempJsonModelFile.getPath());
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        final ApexModel jsonApexModel = new ApexModelFactory().createApexModel(null);
-        result = jsonApexModel.loadFromFile(tempJsonModelFile.getPath());
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        tempJsonModelFile.delete();
-
-        final File tempModelFile = File.createTempFile("ApexModelTest", ".json");
-        result = apexModel.saveToFile(tempModelFile.getPath());
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        final ApexModel testApexModel = new ApexModelFactory().createApexModel(null);
-        result = testApexModel.loadFromFile(tempModelFile.getPath());
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        tempModelFile.delete();
-    }
-
-    @Test
-    public void testApexModelUrl() throws IOException {
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        assertThatThrownBy(() -> apexModel.readFromUrl(null)).isInstanceOf(IllegalArgumentException.class);
-        assertThatThrownBy(() -> apexModel.writeToUrl(null)).isInstanceOf(IllegalArgumentException.class);
-        ApexApiResult result = null;
-        result = apexModel.readFromUrl("zooby/looby");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.writeToUrl("zooby/looby");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.readFromUrl("zooby://zooby/looby");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.writeToUrl("zooby://zooby/looby");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        final File tempJsonModelFile = File.createTempFile("ApexModelTest", "json");
-
-        result = apexModel.saveToFile(tempJsonModelFile.getPath());
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        final String tempFileUrlString = tempJsonModelFile.toURI().toString();
-        result = apexModel.readFromUrl(tempFileUrlString);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.writeToUrl(tempFileUrlString);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        assertEquals("protocol doesn't support output", result.getMessages().get(0));
-
-        tempJsonModelFile.delete();
-    }
-
-    @Test
-    public void testApexModelMisc() throws IOException {
-        final ApexModelImpl apexModelImpl = (ApexModelImpl) new ApexModelFactory().createApexModel(null);
-
-        ApexApiResult result = null;
-
-        result = apexModelImpl.getModelKey();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.listModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.createModel("ModelName", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.updateModel("ModelName", "0.0.1", UUID.randomUUID().toString(), "Model Description");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        apexModelImpl.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-        result = apexModelImpl.loadFromString(modelString);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        final File tempFile = File.createTempFile("ApexModel", "json");
-        tempFile.deleteOnExit();
-        TextFileUtils.putStringAsFile(modelString, tempFile);
-
-        apexModelImpl.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.loadFromFile(tempFile.getPath());
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.analyse();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.validate();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.compare(tempFile.getPath(), true, true);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.compareWithString(modelString, true, true);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.split("policy");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.split(tempFile.getPath(), "policy");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.merge(tempFile.getPath(), true);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModelImpl.mergeWithString(modelString, true);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        assertNotEquals(0, apexModelImpl.hashCode());
-        assertNotNull(apexModelImpl.getCopy());
-        assertNotNull(apexModelImpl.build());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java
deleted file mode 100644
index d3b32b923..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Properties;
-import java.util.UUID;
-import org.junit.Test;
-import org.onap.policy.apex.model.modelapi.impl.ModelFacade;
-
-public class ModelFacadeTest {
-
-    @Test
-    public void testModelFacade() {
-        assertThatThrownBy(() -> new ModelFacade(null, null))
-            .hasMessage("apexModel may not be null");
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        assertThatThrownBy(() -> new ModelFacade(apexModel, null))
-            .hasMessage("apexProperties may not be null");
-        final Properties modelProperties = new Properties();
-        final ModelFacade mf = new ModelFacade(apexModel, modelProperties);
-
-        ApexApiResult result = mf.createModel(null, null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mf.createModel("ModelName", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mf.createModel("ModelName", "0.0.1", null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        modelProperties.setProperty("DEFAULT_CONCEPT_VERSION", "");
-        result = mf.createModel("ModelName", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        modelProperties.setProperty("DEFAULT_CONCEPT_VERSION", "£$£$£$");
-        result = mf.createModel("ModelName", null, null, null);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        modelProperties.setProperty("DEFAULT_CONCEPT_VERSION", "0.0.1");
-        result = mf.createModel("ModelName", null, null, null);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-        result = mf.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = mf.createModel("ModelName", null, null, null);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mf.updateModel("ModelName", null, UUID.randomUUID().toString(), "New Description");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mf.updateModel("ModelName", "0.0.1", UUID.randomUUID().toString(), "New Description");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        modelProperties.remove("DEFAULT_CONCEPT_VERSION");
-        result = mf.updateModel("ModelName", null, UUID.randomUUID().toString(), "New Description");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mf.updateModel(null, null, UUID.randomUUID().toString(), "New Description");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mf.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = mf.updateModel("name", "0.0.1", UUID.randomUUID().toString(), "New Description");
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = mf.getModelKey();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mf.listModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mf.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        assertNotNull(mf);
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java
deleted file mode 100644
index 5bbc95992..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020,2022 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-import org.junit.Test;
-import org.onap.policy.apex.model.modelapi.impl.ModelHandlerFacade;
-import org.onap.policy.common.utils.resources.TextFileUtils;
-
-/**
- * Test the model handler facade.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ModelHandlerFacadeTest {
-
-    @Test
-    public void testModelHandlerFacade() throws IOException {
-        assertThatThrownBy(() -> new ModelHandlerFacade(null, null))
-            .hasMessage("apexModel may not be null");
-        final ApexModel apexModel = new ApexModelFactory().createApexModel(null);
-
-        assertThatThrownBy(() -> new ModelHandlerFacade(apexModel, null))
-            .hasMessage("apexProperties may not be null");
-        final Properties modelProperties = new Properties();
-        final ModelHandlerFacade mhf = new ModelHandlerFacade(apexModel, modelProperties);
-        assertNotNull(mhf);
-
-        ApexApiResult result = mhf.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mhf.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-
-        result = apexModel.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mhf.loadFromString(modelString);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mhf.loadFromString(modelString);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        result = apexModel.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mhf.readFromUrl("blah://somewhere/over/the/rainbow");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.loadFromString(modelString);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mhf.readFromUrl("http://somewhere/over/the/rainbow");
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        final File tempFile = File.createTempFile("ApexModel", "json");
-        tempFile.deleteOnExit();
-
-        result = mhf.writeToUrl("File:///" + tempFile.getCanonicalPath());
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.validate();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = apexModel.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = mhf.validate();
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.compare("src/test/resources/models/NonExistant.json", true, true);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.compareWithString("zooby", true, true);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.split("FailSplit", "NonExistantPolicy");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.split("NonExistantPolicy");
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.merge("src/test/resources/models/NonExistant.json", false);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = mhf.merge("src/test/resources/models/PolicyModel.json", false);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = mhf.loadFromFile("src/test/resources/models/PolicyModel.json");
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = mhf.mergeWithString("@£@$@£", true);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = apexModel.deleteModel();
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = mhf.mergeWithString(modelString, false);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-    }
-}
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java
deleted file mode 100644
index 2a29f5297..000000000
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2022 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.model.modelapi;
-
-import static org.junit.Assert.assertTrue;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import java.util.Map;
-import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelCustomGsonMapAdapter;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
-import org.onap.policy.common.utils.resources.TextFileUtils;
-
-public class RealModelTest {
-    @Test
-    public void testRealModel() throws Exception {
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-
-        AxPolicyModel policyModel = new ApexModelReader<AxPolicyModel>(AxPolicyModel.class).read(modelString);
-
-        AxValidationResult result = new AxValidationResult();
-        assertTrue(policyModel.validate(result).isValid());
-    }
-}