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>

4 files changed, 0 insertions, 4400 deletions

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
-}