Refactored Asynchronous tests to integration

Moved the tests of asynchronous and synchronous inputs and outputs
for Apex from benchmark tests to integration tests which is where
they should be. Also the tests were amended to use the common
integration test data.

Change-Id: Id2d098b0a7d70c50dbb4547b0386cc7bcf6245a9
Issue-ID: POLICY-954
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

21 files changed, 235 insertions, 4980 deletions

diff --git a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti0.jsons b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti0.json
index da11b2c94..da11b2c94 100644
--- a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti0.jsons
+++ b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti0.json
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti1.jsons b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti1.json
index da11b2c94..da11b2c94 100644
--- a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti1.jsons
+++ b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti1.json
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti2.jsons b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti2.json
index da11b2c94..da11b2c94 100644
--- a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti2.jsons
+++ b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsInMulti2.json
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventMiso.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventMimoTest.java
index 2e364647b..cb01af388 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventMiso.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventMimoTest.java
@@ -18,16 +18,39 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.apex.testsuites.performance.benchmark.engine.main;
+package org.onap.policy.apex.testsuites.integration.uservice.adapt.events.syncasync;
 
+import java.io.File;
+
+import org.junit.After;
 import org.junit.Test;
 
-public class TestAsyncEventMiso extends BaseTest {
+public class AsyncEventMimoTest extends BaseEventTest {
+    private final String[] outFilePaths = {
+        "target/examples/events/SampleDomain/EventsOutMulti0.json",
+        "target/examples/events/SampleDomain/EventsOutMulti1.json",
+        "target/examples/events/SampleDomain/EventsOutMulti2.json"
+    };
+
+    /**
+     * Delete output files.
+     */
+    @After
+    public void deleteOutputFiles() {
+        for (String filePath : outFilePaths) {
+            new File(filePath).delete();
+        }
+    }
 
     @Test
-    public void testJsonFileAsyncMiso() throws Exception {
-        final String[] args = {"-c", "src/test/resources/parameters/File2FileJsonEventAsyncMISO.json"};
+    public void testJsonFileAsyncMimo() throws Exception {
+        final String[] args = {
+            "-rfr",
+            "target",
+            "-c",
+            "target/examples/config/SampleDomain/File2FileJsonEventAsyncMIMO.json"
+        };
 
-        testFileEvents(args, new String[] {"src/test/resources/events/EventsOutSingle.json"}, 48956 * 3);
+        testFileEvents(args, outFilePaths, 300);
     }
 }
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestSyncEventMimo.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventMisoTest.java
index 8b35e5dd8..ca4e1ecc1 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestSyncEventMimo.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventMisoTest.java
@@ -18,26 +18,37 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.apex.testsuites.performance.benchmark.engine.main;
+package org.onap.policy.apex.testsuites.integration.uservice.adapt.events.syncasync;
 
+import java.io.File;
+
+import org.junit.After;
 import org.junit.Test;
 
-public class TestSyncEventMimo extends BaseTest {
+public class AsyncEventMisoTest extends BaseEventTest {
+    private final String[] outFilePaths = {
+        "target/examples/events/SampleDomain/EventsOutSingle.json"
+    };
+
+    /**
+     * Delete output files.
+     */
+    @After
+    public void deleteOutputFiles() {
+        for (String filePath : outFilePaths) {
+            new File(filePath).delete();
+        }
+    }
 
     @Test
-    public void testJsonFileAsyncMimo() throws Exception {
+    public void testJsonFileAsyncMiso() throws Exception {
         final String[] args = {
+            "-rfr",
+            "target",
             "-c",
-            "src/test/resources/parameters/File2FileJsonEventSyncMIMO.json"
-        };
-        
-        final String[] outFilePaths = {
-            "src/test/resources/events/EventsOutMulti0.json",
-            "src/test/resources/events/EventsOutMulti1.json",
-            "src/test/resources/events/EventsOutMulti2.json"
+            "target/examples/config/SampleDomain/File2FileJsonEventAsyncMISO.json"
         };
 
-        testFileEvents(args, outFilePaths, 48956 * 3);
+        testFileEvents(args, outFilePaths, 300);
     }
-
 }
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventSimo.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventSimoTest.java
index 0fb191c49..d11fc012d 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventSimo.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventSimoTest.java
@@ -18,26 +18,41 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.apex.testsuites.performance.benchmark.engine.main;
+package org.onap.policy.apex.testsuites.integration.uservice.adapt.events.syncasync;
 
+import java.io.File;
+
+import org.junit.After;
 import org.junit.Test;
 
-public class TestAsyncEventSimo extends BaseTest {
+public class AsyncEventSimoTest extends BaseEventTest {
+    private final String[] outFilePaths = {
+        "target/examples/events/SampleDomain/EventsOutMulti0.json",
+        "target/examples/events/SampleDomain/EventsOutMulti1.json",
+        "target/examples/events/SampleDomain/EventsOutMulti2.json"
+    };
 
+    /**
+     * Delete output files.
+     */
+    @After
+    public void deleteOutputFiles() {
+        for (String filePath : outFilePaths) {
+            new File(filePath).delete();
+        }
+    }
+    
     @Test
     public void testJsonFileAsyncSimo() throws Exception {
         final String[] args = {
+            "-rfr",
+            "target",
             "-c",
-            "src/test/resources/parameters/File2FileJsonEventAsyncSIMO.json"
+            "target/examples/config/SampleDomain/File2FileJsonEventAsyncSIMO.json"
         };
         
-        final String[] outFilePaths = {
-            "src/test/resources/events/EventsOutMulti0.json",
-            "src/test/resources/events/EventsOutMulti1.json",
-            "src/test/resources/events/EventsOutMulti2.json"
-        };
 
-        testFileEvents(args, outFilePaths, 48956);
+        testFileEvents(args, outFilePaths, 100);
     }
 
 }
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventSiso.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventSisoTest.java
index a89e630bc..bd77b424b 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventSiso.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/AsyncEventSisoTest.java
@@ -18,16 +18,36 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.apex.testsuites.performance.benchmark.engine.main;
+package org.onap.policy.apex.testsuites.integration.uservice.adapt.events.syncasync;
 
+import java.io.File;
+
+import org.junit.After;
 import org.junit.Test;
 
-public class TestAsyncEventSiso extends BaseTest {
+public class AsyncEventSisoTest extends BaseEventTest {
+    private final String[] outFilePaths = {
+        "target/examples/events/SampleDomain/EventsOutSingle.json"
+    };
+
+    /**
+     * Delete output files.
+     */
+    @After
+    public void deleteOutputFiles() {
+        for (String filePath : outFilePaths) {
+            new File(filePath).delete();
+        }
+    }
 
     @Test
     public void testJsonFileAsyncSiso() throws Exception {
-        final String[] args = {"-c", "src/test/resources/parameters/File2FileJsonEventAsyncSISO.json"};
+        final String[] args = {
+            "-rfr",
+            "target",
+            "-c",
+            "target/examples/config/SampleDomain/File2FileJsonEventAsyncSISO.json"};
 
-        testFileEvents(args, new String[] {"src/test/resources/events/EventsOutSingle.json"}, 48956);
+        testFileEvents(args, outFilePaths, 100);
     }
 }
diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/BaseEventTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/BaseEventTest.java
new file mode 100644
index 000000000..9199d2a98
--- /dev/null
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/BaseEventTest.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 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.testsuites.integration.uservice.adapt.events.syncasync;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
+import org.onap.policy.apex.model.utilities.TextFileUtils;
+import org.onap.policy.apex.service.engine.main.ApexMain;
+
+public class BaseEventTest {
+    private static final long TIME_OUT_IN_MS = 10000;
+
+    private void waitForOutFiles(final String[] expectedFileNames, final long expectedFileSize) throws IOException {
+        final long totalExpectedSize = expectedFileSize * expectedFileNames.length;
+
+        long startWaitTime = System.currentTimeMillis();
+        long lastTotalSize = 0;
+        
+        do {
+            long totalSize = 0;
+
+            for (String expectedFileName : expectedFileNames) {
+                totalSize += getEventCount(expectedFileName);
+            }
+
+            if (totalSize >= totalExpectedSize) {
+                return;
+            }
+        
+            // We're making progress, extend the timeout
+            if (totalSize > lastTotalSize) {
+                lastTotalSize = totalSize;
+                startWaitTime = System.currentTimeMillis();
+            }
+            
+            ThreadUtilities.sleep(100);
+        }
+        while (TIME_OUT_IN_MS >= System.currentTimeMillis() - startWaitTime);
+    }
+
+    private int getEventCount(final String expectedFileName) throws IOException {
+        File expectedFile = new File(expectedFileName);
+        
+        if (!expectedFile.exists()) {
+            return 0;
+        }
+
+        String expectedFileContents = TextFileUtils.getTextFileAsString(expectedFileName);
+        
+        return StringUtils.countMatches(expectedFileContents, "{");
+    }
+
+    protected void testFileEvents(final String[] args, final String[] expectedFileNames, final long expectedFileSize)
+                    throws Exception {
+        final ApexMain apexMain = new ApexMain(args);
+
+        waitForOutFiles(expectedFileNames, expectedFileSize);
+
+        apexMain.shutdown();
+
+        for (final String expectedFileName : expectedFileNames) {
+            assertEquals(expectedFileSize, getEventCount(expectedFileName));
+        }
+    }
+}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventMimo.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/SyncEventMimoTest.java
index 195840c6d..cf86d2fc1 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestAsyncEventMimo.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/SyncEventMimoTest.java
@@ -18,26 +18,40 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.apex.testsuites.performance.benchmark.engine.main;
+package org.onap.policy.apex.testsuites.integration.uservice.adapt.events.syncasync;
 
+import java.io.File;
+
+import org.junit.After;
 import org.junit.Test;
 
-public class TestAsyncEventMimo extends BaseTest {
+public class SyncEventMimoTest extends BaseEventTest {
+    private final String[] outFilePaths = {
+        "target/examples/events/SampleDomain/EventsOutMulti0.json",
+        "target/examples/events/SampleDomain/EventsOutMulti1.json",
+        "target/examples/events/SampleDomain/EventsOutMulti2.json"
+    };
+    
+    /**
+     * Delete output files.
+     */
+    @After
+    public void deleteOutputFiles() {
+        for (String filePath : outFilePaths) {
+            new File(filePath).delete();
+        }
+    }
 
     @Test
     public void testJsonFileAsyncMimo() throws Exception {
         final String[] args = {
+            "-rfr",
+            "target",
             "-c",
-            "src/test/resources/parameters/File2FileJsonEventAsyncMIMO.json"
+            "target/examples/config/SampleDomain/File2FileJsonEventSyncMIMO.json"
         };
         
-        final String[] outFilePaths = {
-            "src/test/resources/events/EventsOutMulti0.json",
-            "src/test/resources/events/EventsOutMulti1.json",
-            "src/test/resources/events/EventsOutMulti2.json"
-        };
-
-        testFileEvents(args, outFilePaths, 48956 * 3);
+        testFileEvents(args, outFilePaths, 300);
     }
 
 }
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestSyncEventSiso.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/SyncEventSisoTest.java
index 891ad7198..7fed77bf2 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/TestSyncEventSiso.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/events/syncasync/SyncEventSisoTest.java
@@ -18,16 +18,36 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.apex.testsuites.performance.benchmark.engine.main;
+package org.onap.policy.apex.testsuites.integration.uservice.adapt.events.syncasync;
 
+import java.io.File;
+
+import org.junit.After;
 import org.junit.Test;
 
-public class TestSyncEventSiso extends BaseTest {
+public class SyncEventSisoTest extends BaseEventTest {
+    private final String[] outFilePaths = {
+        "target/examples/events/SampleDomain/EventsOutSingle.json"
+    };
+    
+    /**
+     * Delete output files.
+     */
+    @After
+    public void deleteOutputFiles() {
+        for (String filePath : outFilePaths) {
+            new File(filePath).delete();
+        }
+    }
 
     @Test
     public void testJsonFileAsyncSiso() throws Exception {
-        final String[] args = {"-c", "src/test/resources/parameters/File2FileJsonEventSyncSISO.json"};
+        final String[] args = {
+            "-rfr",
+            "target",
+            "-c",
+            "target/examples/config/SampleDomain/File2FileJsonEventSyncSISO.json"};
 
-        testFileEvents(args, new String[] {"src/test/resources/events/EventsOutSingle.json"}, 48956);
+        testFileEvents(args, outFilePaths, 100);
     }
 }
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/BaseTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/BaseTest.java
deleted file mode 100644
index 52bdb056b..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/main/BaseTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 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.testsuites.performance.benchmark.engine.main;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.concurrent.TimeUnit;
-
-import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
-import org.onap.policy.apex.model.utilities.TextFileUtils;
-import org.onap.policy.apex.service.engine.main.ApexMain;
-
-public class BaseTest {
-    protected static final long TIME_OUT_IN_MS = TimeUnit.SECONDS.toMillis(10);
-
-    protected long getFileLength(final String file, final long expectedFileSize) throws IOException {
-        return getFileLength(10, file, expectedFileSize);
-    }
-
-    protected long getFileLength(final int loopTime, final String file, final long expectedFileSize)
-            throws IOException {
-        long length = 0;
-        for (int i = 0; i < loopTime; i++) {
-            final String fileString = TextFileUtils.getTextFileAsString(file).replaceAll("\\s+", "");
-            length = fileString.length();
-            if (length > 0 && length >= expectedFileSize) {
-                break;
-            }
-            ThreadUtilities.sleep(500);
-        }
-        return length;
-    }
-
-    protected void waitForOutFiles(final File... files) {
-        final long timeInMillis = System.currentTimeMillis();
-        while (!isFilesExist(files)) {
-            if (System.currentTimeMillis() - timeInMillis > TIME_OUT_IN_MS) {
-                break;
-            }
-            ThreadUtilities.sleep(500);
-        }
-
-    }
-
-    private void assertFilesExists(final File... files) {
-        for (final File file : files) {
-            assertTrue("Test failed, the output " + file + "event file was not created", file.exists());
-        }
-    }
-
-    private void deleteFiles(final File... files) throws IOException {
-        for (final File file : files) {
-            Files.deleteIfExists(file.toPath());
-        }
-    }
-
-    private boolean isFilesExist(final File[] files) {
-        for (final File file : files) {
-            if (!file.exists()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    protected File[] toFile(final String[] filesPath) {
-        if (filesPath == null || filesPath.length == 0) {
-            return new File[] {};
-        }
-        final File[] files = new File[filesPath.length];
-
-        for (int index = 0; index < filesPath.length; index++) {
-            files[index] = new File(filesPath[index]);
-        }
-
-        return files;
-    }
-
-    protected void testFileEvents(final String[] args, final String[] expectedFilesPath, final long expectedFileSize)
-            throws Exception {
-        final ApexMain apexMain = new ApexMain(args);
-
-        final File[] expectedFiles = toFile(expectedFilesPath);
-        try {
-
-            waitForOutFiles(expectedFiles);
-            assertFilesExists(expectedFiles);
-
-            for (final String filePath : expectedFilesPath) {
-                assertEquals(expectedFileSize, getFileLength(filePath, expectedFileSize));
-            }
-
-            apexMain.shutdown();
-
-        } finally {
-            deleteFiles(expectedFiles);
-        }
-    }
-
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti0.json b/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti0.json
deleted file mode 100644
index f0a0a3da8..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti0.json
+++ /dev/null
@@ -1,1100 +0,0 @@
-{
-    "nameSpace": "org.onap.policy.apex.sample.events",
-    "name": "Event0100",
-    "version": "0.0.1",
-    "source": "test",
-    "target": "apex",
-    "TestSlogan": "Test slogan for External Event1",
-    "TestMatchCase": 0,
-    "TestTimestamp": 1469781869268,
-    "TestTemperature": 8071.559
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 517.19727
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9080.866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4263.7085
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2342.069
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 6400.4565
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9495.611
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4872.2935
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8130.8086
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2580.434
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 3169.4663
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4517.7646
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9600.465
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8720.648
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 1031.3821
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 959.9608
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1483.7533
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 394.8325
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 59.376953
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 862.1466
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8557.394
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6732.3687
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7155.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4896.5264
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8457.574
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4085.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4198.338
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 105.033516
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8219.068
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8780.495
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6224.9775
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4218.1353
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4719.9116
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4592.7275
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7874.2705
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9866.951
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7536.962
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2430.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6369.2866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7396.739
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6187.027
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2216.0667
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4855.6562
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5205.6836
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 418.89252
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5307.6343
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7034.2065
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7784.3804
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 3656.007
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8538.289
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6515.7104
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4562.0537
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9030.76
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9085.617
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1244.1838
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9286.382
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9573.472
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9994.268
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3556.8076
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1305.1998
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6063.7573
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8860.109
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1599.9061
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4316.625
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2753.6135
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4469.7656
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4155.1416
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1627.2205
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5554.9585
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5863.8896
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9095.753
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5641.7603
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6120.2446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3478.2087
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1807.8446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8476.179
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7418.1934
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4800.719
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8741.285
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2099.0818
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 138.22377
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 272.6066
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2604.9036
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 540.5176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1482.7478
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1053.8315
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6267.906
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 636.44586
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 902.7964
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 259.42923
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6066.484
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2918.8723
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6470.262
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2603.0845
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4435.378
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3989.0928
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7657.731
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6677.433
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9456.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8723.999
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti1.json b/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti1.json
deleted file mode 100644
index f0a0a3da8..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti1.json
+++ /dev/null
@@ -1,1100 +0,0 @@
-{
-    "nameSpace": "org.onap.policy.apex.sample.events",
-    "name": "Event0100",
-    "version": "0.0.1",
-    "source": "test",
-    "target": "apex",
-    "TestSlogan": "Test slogan for External Event1",
-    "TestMatchCase": 0,
-    "TestTimestamp": 1469781869268,
-    "TestTemperature": 8071.559
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 517.19727
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9080.866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4263.7085
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2342.069
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 6400.4565
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9495.611
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4872.2935
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8130.8086
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2580.434
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 3169.4663
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4517.7646
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9600.465
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8720.648
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 1031.3821
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 959.9608
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1483.7533
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 394.8325
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 59.376953
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 862.1466
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8557.394
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6732.3687
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7155.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4896.5264
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8457.574
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4085.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4198.338
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 105.033516
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8219.068
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8780.495
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6224.9775
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4218.1353
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4719.9116
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4592.7275
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7874.2705
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9866.951
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7536.962
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2430.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6369.2866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7396.739
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6187.027
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2216.0667
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4855.6562
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5205.6836
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 418.89252
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5307.6343
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7034.2065
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7784.3804
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 3656.007
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8538.289
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6515.7104
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4562.0537
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9030.76
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9085.617
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1244.1838
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9286.382
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9573.472
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9994.268
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3556.8076
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1305.1998
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6063.7573
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8860.109
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1599.9061
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4316.625
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2753.6135
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4469.7656
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4155.1416
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1627.2205
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5554.9585
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5863.8896
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9095.753
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5641.7603
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6120.2446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3478.2087
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1807.8446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8476.179
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7418.1934
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4800.719
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8741.285
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2099.0818
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 138.22377
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 272.6066
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2604.9036
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 540.5176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1482.7478
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1053.8315
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6267.906
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 636.44586
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 902.7964
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 259.42923
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6066.484
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2918.8723
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6470.262
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2603.0845
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4435.378
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3989.0928
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7657.731
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6677.433
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9456.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8723.999
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti2.json b/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti2.json
deleted file mode 100644
index f0a0a3da8..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInMulti2.json
+++ /dev/null
@@ -1,1100 +0,0 @@
-{
-    "nameSpace": "org.onap.policy.apex.sample.events",
-    "name": "Event0100",
-    "version": "0.0.1",
-    "source": "test",
-    "target": "apex",
-    "TestSlogan": "Test slogan for External Event1",
-    "TestMatchCase": 0,
-    "TestTimestamp": 1469781869268,
-    "TestTemperature": 8071.559
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 517.19727
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9080.866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4263.7085
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2342.069
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 6400.4565
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9495.611
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4872.2935
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8130.8086
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2580.434
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 3169.4663
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4517.7646
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9600.465
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8720.648
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 1031.3821
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 959.9608
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1483.7533
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 394.8325
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 59.376953
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 862.1466
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8557.394
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6732.3687
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7155.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4896.5264
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8457.574
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4085.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4198.338
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 105.033516
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8219.068
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8780.495
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6224.9775
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4218.1353
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4719.9116
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4592.7275
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7874.2705
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9866.951
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7536.962
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2430.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6369.2866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7396.739
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6187.027
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2216.0667
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4855.6562
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5205.6836
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 418.89252
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5307.6343
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7034.2065
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7784.3804
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 3656.007
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8538.289
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6515.7104
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4562.0537
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9030.76
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9085.617
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1244.1838
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9286.382
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9573.472
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9994.268
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3556.8076
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1305.1998
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6063.7573
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8860.109
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1599.9061
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4316.625
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2753.6135
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4469.7656
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4155.1416
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1627.2205
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5554.9585
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5863.8896
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9095.753
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5641.7603
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6120.2446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3478.2087
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1807.8446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8476.179
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7418.1934
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4800.719
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8741.285
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2099.0818
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 138.22377
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 272.6066
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2604.9036
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 540.5176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1482.7478
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1053.8315
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6267.906
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 636.44586
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 902.7964
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 259.42923
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6066.484
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2918.8723
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6470.262
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2603.0845
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4435.378
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3989.0928
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7657.731
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6677.433
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9456.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8723.999
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInSingle.json b/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInSingle.json
deleted file mode 100644
index f0a0a3da8..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/events/EventsInSingle.json
+++ /dev/null
@@ -1,1100 +0,0 @@
-{
-    "nameSpace": "org.onap.policy.apex.sample.events",
-    "name": "Event0100",
-    "version": "0.0.1",
-    "source": "test",
-    "target": "apex",
-    "TestSlogan": "Test slogan for External Event1",
-    "TestMatchCase": 0,
-    "TestTimestamp": 1469781869268,
-    "TestTemperature": 8071.559
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 517.19727
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9080.866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4263.7085
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2342.069
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 6400.4565
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9495.611
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4872.2935
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8130.8086
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 2580.434
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 3169.4663
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 4517.7646
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 9600.465
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 8720.648
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869269,
-  "TestTemperature": 1031.3821
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 959.9608
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1483.7533
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 394.8325
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 59.376953
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 862.1466
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8557.394
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6732.3687
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7155.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4896.5264
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8457.574
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4085.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4198.338
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 105.033516
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8219.068
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8780.495
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6224.9775
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4218.1353
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4719.9116
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4592.7275
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7874.2705
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9866.951
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7536.962
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2430.3843
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6369.2866
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7396.739
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6187.027
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 2216.0667
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4855.6562
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5205.6836
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 418.89252
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 5307.6343
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7034.2065
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 7784.3804
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 3656.007
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 8538.289
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 6515.7104
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 4562.0537
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9030.76
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9085.617
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 1244.1838
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9286.382
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9573.472
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869270,
-  "TestTemperature": 9994.268
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3556.8076
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1305.1998
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6063.7573
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8860.109
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1599.9061
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4316.625
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2753.6135
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4469.7656
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4155.1416
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1627.2205
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5554.9585
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5863.8896
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9095.753
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 5641.7603
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6120.2446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3478.2087
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1807.8446
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8476.179
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7418.1934
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4800.719
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8741.285
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2099.0818
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 138.22377
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 272.6066
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 1,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2604.9036
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 540.5176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1482.7478
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 1053.8315
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6267.906
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 636.44586
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 902.7964
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 259.42923
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6066.484
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2918.8723
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6470.262
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 2603.0845
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 4435.378
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 3989.0928
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 7657.731
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 2,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 6677.433
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0100",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event1",
-  "TestMatchCase": 0,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 9456.176
-}
-{
-  "nameSpace": "org.onap.policy.apex.sample.events",
-  "name": "Event0000",
-  "version": "0.0.1",
-  "source": "test",
-  "target": "apex",
-  "TestSlogan": "Test slogan for External Event0",
-  "TestMatchCase": 3,
-  "TestTimestamp": 1469781869271,
-  "TestTemperature": 8723.999
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMIMO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMIMO.json
deleted file mode 100644
index 05ef17358..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMIMO.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMISO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMISO.json
deleted file mode 100644
index 38c949afb..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMISO.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSIMO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSIMO.json
deleted file mode 100644
index 71cc26177..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSIMO.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSISO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSISO.json
deleted file mode 100644
index f12baadbe..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSISO.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncMIMO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncMIMO.json
deleted file mode 100644
index 8f53a3c1f..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncMIMO.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aProducer0",
-            "synchronousTimeout": 1000
-        },
-        "aConsumer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aProducer1",
-            "synchronousTimeout": 1000
-        },
-        "aConsumer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aProducer2",
-            "synchronousTimeout": 1000
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aConsumer0",
-            "synchronousTimeout": 1000
-        },
-        "aProducer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aConsumer1",
-            "synchronousTimeout": 1000
-        },
-        "aProducer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aConsumer2",
-            "synchronousTimeout": 1000
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncSISO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncSISO.json
deleted file mode 100644
index a7df66796..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncSISO.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "SyncProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "SyncConsumer",
-            "synchronousTimeout": 1000
-        }
-    },
-    "eventInputParameters": {
-        "SyncConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "SyncProducer",
-            "synchronousTimeout": 1000
-        }
-    }
-}