diff --git a/src/test/resources/application-no-camunda.properties b/src/test/resources/application-no-camunda.properties
index f7b2bad..2e284b0 100644
--- a/src/test/resources/application-no-camunda.properties
+++ b/src/test/resources/application-no-camunda.properties
@@ -76,42 +76,15 @@
 
 camel.springboot.consumer-template-cache-size=1000
 camel.springboot.producer-template-cache-size=1000
-camel.springboot.jmx-enabled=true
+camel.springboot.jmx-enabled=false
 camel.defaultthreadpool.poolsize=10
 camel.defaultthreadpool.maxpoolsize=20
 camel.defaultthreadpool.maxqueuesize=1000
 camel.defaultthreadpool.keepaliveTime=60
 camel.defaultthreadpool.rejectpolicy=CallerRuns
-
-#server.port=0
-
-#Camunda Process Engine DataSource connection Details
-spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.camunda.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647
-spring.datasource.camunda.username=camunda
-spring.datasource.camunda.password=e1bb2a8381d1aa6c09879bd627db3bb560ad29e8a3343fe6aa7e6a7ba622da4e
-spring.datasource.camunda.validationQuery=SELECT 1
-spring.datasource.camunda.validationQueryTimeout=20000
-spring.datasource.camunda.validationInterval=30000
-spring.datasource.camunda.testWhileIdle = true
-spring.datasource.camunda.minIdle = 0
-spring.datasource.camunda.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.camunda.testOnBorrow=true
-spring.datasource.camunda.ignoreExceptionOnPreLoad=true
-
-#Camunda application properties
-#Camunda history level
-camunda.bpm.history-level=none
-camunda.bpm.enabled=false
-camunda.bpm.jpa.enabled=false
-camunda.bpm.auto-deployment-enabled=false
-camunda.bpm.job-execution.active=false
-camunda.bpm.job-execution.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.metrics.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.database.schema-update=true
+#camel.springboot.xmlRoutes = false
+camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml
+#camel.springboot.typeConversion = false
 
 #clds datasource connection details
 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
diff --git a/src/test/resources/clds/clds-reference.properties b/src/test/resources/clds/clds-reference.properties
index 4627269..d6c8bc4 100644
--- a/src/test/resources/clds/clds-reference.properties
+++ b/src/test/resources/clds/clds-reference.properties
@@ -2,19 +2,19 @@
 # ============LICENSE_START=======================================================
 # ONAP CLAMP
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
 #                             reserved.
 # ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
+# Licensed under the Apache License, Version 2.0 (the "License"); 
+# you may not use this file except in compliance with the License. 
 # You may obtain a copy of the License at
-#
+# 
 # http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
 # limitations under the License.
 # ============LICENSE_END============================================
 # ===================================================================
@@ -77,11 +77,11 @@
 op.eNodeB.period=10s
 #
 # Sdc service properties
-sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/
-sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080
-sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services
-sdc.serviceUsername=test
-sdc.servicePassword=aa2871669d793c7fb7abbcda31b88b4c29bf2982755b25f08f8d0130539c11b0
+sdc.catalog.url=http://localhost:${docker.http-cache.port.host}/sdc/v1/catalog/
+sdc.hostUrl=http://localhost:${docker.http-cache.port.host}
+sdc.serviceUrl=http://localhost:${docker.http-cache.port.host}/sdc/v1/catalog/services
+sdc.serviceUsername=clamp
+sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981
 sdc.artifactLabel=blueprintclampcockpit
 sdc.sdcX-InstanceID=CLAMP
 sdc.artifactType=DCAE_INVENTORY_BLUEPRINT
@@ -98,7 +98,7 @@
 action.test.override=false
 # if action.insert.test.event is true, then insert event even if the action is set to test
 action.insert.test.event=false
-CLDS_SERVICE_CACHE_MAX_SECONDS=30
+clds.service.cache.invalidate.after.seconds=120
 
 #DCAE Inventory Url Properties
 DCAE_INVENTORY_URL = http://dcae.api.simpledemo.onap.org:8080
diff --git a/src/test/resources/example/modelBpmnProp.json b/src/test/resources/example/model-properties/custom/modelBpmn.json
similarity index 100%
rename from src/test/resources/example/modelBpmnProp.json
rename to src/test/resources/example/model-properties/custom/modelBpmn.json
diff --git a/src/test/resources/example/model-properties/custom/modelBpmnProperties.json b/src/test/resources/example/model-properties/custom/modelBpmnProperties.json
new file mode 100644
index 0000000..fc2f1fd
--- /dev/null
+++ b/src/test/resources/example/model-properties/custom/modelBpmnProperties.json
@@ -0,0 +1,248 @@
+{
+    "global":
+    [
+        {
+            "name": "service",
+            "value":
+            [
+                "0f983e18-4603-4bb4-a98c-e29691fb16a1"
+            ]
+        },
+
+        {
+            "name": "vf",
+            "value":
+            [
+                "6c7aaec2-59eb-41d9-8681-b7f976ab668d"
+            ]
+        },
+
+        {
+            "name": "actionSet",
+            "value":
+            [
+                "enbRecipe"
+            ]
+        },
+
+        {
+            "name": "location",
+            "value":
+            [
+                "SNDGCA64"
+            ]
+        }
+    ],
+
+    "Policy_":
+    {
+        "Policy1":
+        [
+            {
+                "name": "pname",
+                "value": "Policy1"
+            },
+
+            {
+                "name": "pid",
+                "value": "1"
+            },
+
+            {
+                "name": "timeout",
+                "value": "500"
+            },
+
+            {
+                "policyConfigurations":
+                [
+                    [
+                        {
+                            "name": "recipe",
+                            "value":
+                            [
+                                "restart"
+                            ]
+                        },
+
+                        {
+                            "name": "maxRetries",
+                            "value":
+                            [
+                                "3"
+                            ]
+                        },
+
+                        {
+                            "name": "retryTimeLimit",
+                            "value":
+                            [
+                                "180"
+                            ]
+                        },
+
+                        {
+                            "name": "_id",
+                            "value":
+                            [
+                                "n9bQ4t6"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicy",
+                            "value":
+                            [
+                                ""
+                            ]
+                        },
+                        {
+                            "name": "targetResourceId",
+                            "value":
+                            [
+                                "resource-id"
+                            ]
+                        }
+                    ],
+
+                    [
+                        {
+                            "name": "recipe",
+                            "value":
+                            [
+                                "rebuild"
+                            ]
+                        },
+
+                        {
+                            "name": "maxRetries",
+                            "value":
+                            [
+                                "3"
+                            ]
+                        },
+
+                        {
+                            "name": "retryTimeLimit",
+                            "value":
+                            [
+                                "180"
+                            ]
+                        },
+
+                        {
+                            "name": "_id",
+                            "value":
+                            [
+                                "ItE5xKT"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicy",
+                            "value":
+                            [
+                                "n9bQ4t6"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicyConditions",
+                            "value":
+                            [
+                                "Failure_Retries",
+                                "Failure_Timeout",
+                                "Failure_Exception",
+                                "Failure"
+                            ]
+                        },
+                        {
+                            "name": "targetResourceId",
+                            "value":
+                            [
+                                "resource-id"
+                            ]
+                        }
+                    ]
+                ]
+            }
+        ]
+    },
+
+    "TCA_":
+    {
+        "Narra":
+        [
+            {
+                "name": "tname",
+                "value": "Narra"
+            },
+
+            {
+                "name": "tuuid",
+                "value": "886be8da-14fe-tca1-d04b-d13b55d58df9"
+            },
+
+            {
+                "name": "tnfc",
+                "value": "ENBE"
+            },
+
+            {
+                "name": "tcaEnab",
+                "value": "on"
+            },
+
+            {
+                "name": "tcaPol",
+                "value": "Policy1"
+            },
+
+            {
+                "name": "tcaPolId",
+                "value": "1"
+            },
+
+            {
+                "name": "tcaInt",
+                "value": "2"
+            },
+
+            {
+                "name": "tcaSev",
+                "value": "Warning"
+            },
+
+            {
+                "name": "tcaVio",
+                "value": "3"
+            },
+
+            {
+                "serviceConfigurations":
+                [
+                    [
+                        "PMRRCCONNESTABFAILCELLLATENCY",
+                        "LESS",
+                        "4",
+                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
+                    ],
+
+                    [
+                        "PMRAATTCBRA",
+                        "GREATER",
+                        "30",
+                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
+                    ]
+                ]
+            }
+        ]
+    },
+    
+    "CustomType_": [
+      {
+         "name": "test",
+         "value": "This is a test"
+      }
+    ]
+}
\ No newline at end of file
diff --git a/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json b/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
index cd76a12..43fecc9 100644
--- a/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
@@ -69,13 +69,6 @@
       ]
     },
     {
-      "name": "location",
-      "value": [
-        "SNDGCA64",
-        "ALPRGAED"
-      ]
-    },
-    {
       "name": "vf",
       "value": [
         "f5213e3a-9191-4362-93b5-b67f8d770e44"
diff --git a/src/test/resources/example/model-properties/modelBpmn.json b/src/test/resources/example/model-properties/modelBpmn.json
deleted file mode 100644
index 8f7b8e6..0000000
--- a/src/test/resources/example/model-properties/modelBpmn.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "policy": [
-    {
-      "id": "Policy_0honxgv",
-      "from": "TCA_1jy9to4"
-    }
-  ],
-  "tca": [
-    {
-      "id": "TCA_1jy9to4",
-      "from": "Holmes_0i4n2mm"
-    }
-  ],
-  "holmes": [
-    {
-      "id": "Holmes_0i4n2mm",
-      "from": "VesCollector_0orydnh"
-    }
-  ],
-  "vesCollector": [
-    {
-      "id": "VesCollector_0orydnh",
-      "from": "StartEvent_1"
-    }
-  ]
-}
diff --git a/src/test/resources/example/model-properties/modelBpmnProp.json b/src/test/resources/example/model-properties/modelBpmnProp.json
deleted file mode 100644
index eacb124..0000000
--- a/src/test/resources/example/model-properties/modelBpmnProp.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "Policy_0honxgv": {
-    "policy1": [
-      {
-        "name": "pname",
-        "value": "policy1"
-      },
-      {
-        "name": "pid",
-        "value": "0"
-      },
-      {
-        "name": "timeout",
-        "value": "345"
-      },
-      {
-        "policyConfigurations": [
-          [
-            {
-              "name": "maxRetries",
-              "value": [
-                "3"
-              ]
-            },
-            {
-              "name": "retryTimeLimit",
-              "value": [
-                "180"
-              ]
-            },
-            {
-              "name": "_id",
-              "value": [
-                "dGLuNqg"
-              ]
-            },
-            {
-              "name": "parentPolicy",
-              "value": [
-                ""
-              ]
-            },
-            {
-              "name": "targetResourceId",
-              "value": [
-                "resourceid"
-              ]
-            }
-          ]
-        ]
-      }
-    ]
-  },
-  "TCA_1jy9to4": {
-    "tca1": [
-      {
-        "name": "tname",
-        "value": "tca1"
-      },
-      {
-        "name": "tuuid",
-        "value": "f43e3499-8c9c-teed-bb41-a0cb38ebf0d3"
-      },
-      {
-        "name": "tnfc",
-        "value": ""
-      },
-      {
-        "name": "tcaEnab",
-        "value": "on"
-      },
-      {
-        "name": "tcaPol",
-        "value": "policy1"
-      },
-      {
-        "name": "tcaPolId",
-        "value": "0"
-      },
-      {
-        "name": "tcaInt",
-        "value": "1"
-      },
-      {
-        "name": "tcaSev",
-        "value": "NORMAL"
-      },
-      {
-        "name": "tcaVio",
-        "value": "1"
-      },
-      {
-        "serviceConfigurations": [
-        ]
-      }
-    ]
-  },
-  "Holmes_0i4n2mm": [
-    {
-      "name": "correlationalLogic",
-      "value": "blabla"
-    },
-    {
-      "name": "configPolicyName",
-      "value": "policy1"
-    }
-  ]
-}
diff --git a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json b/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json
deleted file mode 100644
index 3030adf..0000000
--- a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "tca": {
-    "tname": "New_Set",
-    "tcaInt": "1",
-    "tcaVio": "1",
-    "tcaSev": {
-      "NORMAL": "NORMAL",
-      "CRITICAL": "CRITICAL",
-      "MAJOR": "MAJOR",
-      "MINOR": "MINOR",
-      "WARNING": "WARNING"
-    },
-    "fieldPath": {
-      "FIELDPATH_test_1": "FIELDPATH_test_1",
-      "FIELDPATH_test_2": "FIELDPATH_test_2"
-    },
-    "operator": {
-      ">": "GREATER",
-      "=": "EQUAL",
-      "<": "LESS"
-    },
-    "opsPolicy": {
-      "POLICY_test_X": "POLICY_test_X",
-      "POLICY_test_Y": "POLICY_test_Y"
-    }
-  },
-  "global": [
-    {
-      "name": "actionSet",
-      "value": [
-        "vnfRecipe"
-      ]
-    },
-    {
-      "name": "location",
-      "value": [
-        "SNDGCA64",
-        "ALPRGAED"
-      ]
-    },
-    {
-      "name": "vf",
-      "value": [
-        "f5213e3a-9191-4362-93b5-b67f8d770e44"
-      ]
-    },
-    {
-      "name": "location",
-      "value": [
-        "SNDGCA64",
-        "ALPRGAED",
-        "LSLEILAA",
-        "MDTWNJC1"
-      ]
-    }
-  ],
-  "policy": {
-    "pname": "0",
-    "timeout": 345,
-    "vnfRecipe": {
-      "": "",
-      "restart": "Restart",
-      "rebuild": "Rebuild",
-      "migrate": "Migrate",
-      "healthCheck": "Health Check",
-      "evacuate": "Evacuate"
-    },
-    "enbRecipe": {
-      "": "",
-      "reset": "Reset"
-    },
-    "maxRetries": "3",
-    "retryTimeLimit": 180,
-    "resource": {
-      "vCTS": "vCTS",
-      "v3CDB": "v3CDB",
-      "vUDR": "vUDR",
-      "vCOM": "vCOM",
-      "vRAR": "vRAR",
-      "vLCS": "vLCS",
-      "vUDR-BE": "vUDR-BE",
-      "vDBE": "vDBE"
-    },
-    "parentPolicyConditions": {
-      "Failure_Retries": "Failure: Max Retries Exceeded",
-      "Failure_Timeout": "Failure: Time Limit Exceeded",
-      "Failure_Guard": "Failure: Guard",
-      "Failure_Exception": "Failure: Exception",
-      "Failure": "Failure: Other",
-      "Success": "Success"
-    },
-    "targetResourceId": "resourceid"
-  },
-  "shared": {
-    "byService": {
-      "": {
-        "vf": {
-          "": ""
-        },
-        "location": {
-          "": ""
-        },
-        "alarmCondition": {
-          "": ""
-        }
-      }
-    },
-    "byVf": {
-      "": {
-        "vfc": {
-          "": ""
-        }
-      }
-    }
-  }
-}
diff --git a/src/test/resources/example/modelBpmnPropForPolicy.json b/src/test/resources/example/model-properties/policy/modelBpmn.json
similarity index 100%
rename from src/test/resources/example/modelBpmnPropForPolicy.json
rename to src/test/resources/example/model-properties/policy/modelBpmn.json
diff --git a/src/test/resources/example/modelProp.json b/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
similarity index 100%
rename from src/test/resources/example/modelProp.json
rename to src/test/resources/example/model-properties/policy/modelBpmnProperties.json
diff --git a/src/test/resources/example/model-properties/tca/modelBpmnProperties.json b/src/test/resources/example/model-properties/tca/modelBpmnProperties.json
index 7bb4fe0..8e2780c 100644
--- a/src/test/resources/example/model-properties/tca/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/tca/modelBpmnProperties.json
@@ -101,20 +101,13 @@
     {
       "name": "service",
       "value": [
-        "serviceUUID"
-      ]
-    },
-    {
-      "name": "location",
-      "value": [
-        "SNDGCA64",
-        "ALPRGAED"
+        "4cc5b45a-1f63-4194-8100-cd8e14248c92"
       ]
     },
     {
       "name": "vf",
       "value": [
-        "f5213e3a-9191-4362-93b5-b67f8d770e44"
+        "023a3f0d-1161-45ff-b4cf-8918a8ccf3ad"
       ]
     },
     {
diff --git a/src/test/resources/example/modelPropForPolicy.json b/src/test/resources/example/modelPropForPolicy.json
deleted file mode 100644
index bf34809..0000000
--- a/src/test/resources/example/modelPropForPolicy.json
+++ /dev/null
@@ -1,432 +0,0 @@
-{
-    "global": 
-    [
-        {
-            "name": "service",
-            "value": 
-            [
-                "0f983e18-4603-4bb4-a98c-e29691fb16a1"
-            ]
-        },
-
-        {
-            "name": "vf",
-            "value": 
-            [
-                "6c7aaec2-59eb-41d9-8681-b7f976ab668d"
-            ]
-        },
-
-        {
-            "name": "location",
-            "value": 
-            [
-                "SNDGCA64"
-            ]
-        }
-    ],
-
-    "Policy_": 
-    {
-        "Policy1": 
-        [
-            {
-                "name": "pname",
-                "value": "Policy1"
-            },
-
-            {
-                "name": "pid",
-                "value": "1"
-            },
-
-            {
-                "name": "timeout",
-                "value": "500"
-            },
-
-            {
-                "policyConfigurations": 
-                [
-                    [
-                        {
-                            "name": "recipe",
-                            "value": 
-                            [
-                                "restart"
-                            ]
-                        },
-
-                        {
-                            "name": "maxRetries",
-                            "value": 
-                            [
-                                "3"
-                            ]
-                        },
-
-                        {
-                            "name": "retryTimeLimit",
-                            "value": 
-                            [
-                                "180"
-                            ]
-                        },
-
-                        {
-                            "name": "_id",
-                            "value": 
-                            [
-                                "n9bQ4t6"
-                            ]
-                        },
-
-                        {
-                            "name": "parentPolicy",
-                            "value": 
-                            [
-                                ""
-                            ]
-                        },
-                        {
-                            "name": "targetResourceId",
-                            "value": 
-                            [
-                                "resource-id"
-                            ]
-                        }
-                    ],
-
-                    [
-                        {
-                            "name": "recipe",
-                            "value": 
-                            [
-                                "rebuild"
-                            ]
-                        },
-
-                        {
-                            "name": "maxRetries",
-                            "value": 
-                            [
-                                "3"
-                            ]
-                        },
-
-                        {
-                            "name": "retryTimeLimit",
-                            "value": 
-                            [
-                                "180"
-                            ]
-                        },
-
-                        {
-                            "name": "_id",
-                            "value": 
-                            [
-                                "ItE5xKT"
-                            ]
-                        },
-
-                        {
-                            "name": "parentPolicy",
-                            "value": 
-                            [
-                                "n9bQ4t6"
-                            ]
-                        },
-
-                        {
-                            "name": "parentPolicyConditions",
-                            "value": 
-                            [
-                                "Failure_Retries",
-                                "Failure_Timeout",
-                                "Failure_Exception",
-                                "Failure"
-                            ]
-                        },
-                        {
-                            "name": "targetResourceId",
-                            "value": 
-                            [
-                                "resource-id"
-                            ]
-                        }
-                    ]
-                ]
-            }
-        ],
-
-        "Policy2": 
-        [
-            {
-                "name": "pname",
-                "value": "Policy2"
-            },
-
-            {
-                "name": "pid",
-                "value": "2"
-            },
-
-            {
-                "name": "timeout",
-                "value": "500"
-            },
-
-            {
-                "policyConfigurations": 
-                [
-                    [
-                        {
-                            "name": "recipe",
-                            "value": 
-                            [
-                                "restart"
-                            ]
-                        },
-
-                        {
-                            "name": "maxRetries",
-                            "value": 
-                            [
-                                "3"
-                            ]
-                        },
-
-                        {
-                            "name": "retryTimeLimit",
-                            "value": 
-                            [
-                                "180"
-                            ]
-                        },
-
-                        {
-                            "name": "_id",
-                            "value": 
-                            [
-                                "n9bQ4t6"
-                            ]
-                        },
-
-                        {
-                            "name": "parentPolicy",
-                            "value": 
-                            [
-                                ""
-                            ]
-                        },
-                        {
-                            "name": "targetResourceId",
-                            "value": 
-                            [
-                                "resource-id"
-                            ]
-                        }
-                    ],
-
-                    [
-                        {
-                            "name": "recipe",
-                            "value": 
-                            [
-                                "rebuild"
-                            ]
-                        },
-
-                        {
-                            "name": "maxRetries",
-                            "value": 
-                            [
-                                "3"
-                            ]
-                        },
-
-                        {
-                            "name": "retryTimeLimit",
-                            "value": 
-                            [
-                                "180"
-                            ]
-                        },
-
-                        {
-                            "name": "_id",
-                            "value": 
-                            [
-                                "ItE5xKT"
-                            ]
-                        },
-
-                        {
-                            "name": "parentPolicy",
-                            "value": 
-                            [
-                                "n9bQ4t6"
-                            ]
-                        },
-
-                        {
-                            "name": "parentPolicyConditions",
-                            "value": 
-                            [
-                                "Failure_Retries",
-                                "Failure_Timeout",
-                                "Failure_Exception",
-                                "Failure"
-                            ]
-                        },
-                        {
-                            "name": "targetResourceId",
-                            "value": 
-                            [
-                                "resource-id"
-                            ]
-                        }
-                    ]
-                ]
-            }
-        ]
-    },
-
-    "TCA_": 
-    {
-        "Narra": 
-        [
-            {
-                "name": "tname",
-                "value": "Narra"
-            },
-
-            {
-                "name": "tuuid",
-                "value": "886be8da-14fe-tca1-d04b-d13b55d58df9"
-            },
-
-            {
-                "name": "tnfc",
-                "value": "ENBE"
-            },
-
-            {
-                "name": "tcaEnab",
-                "value": "on"
-            },
-
-            {
-                "name": "tcaPol",
-                "value": "Policy1"
-            },
-
-            {
-                "name": "tcaPolId",
-                "value": "1"
-            },
-
-            {
-                "name": "tcaInt",
-                "value": "2"
-            },
-
-            {
-                "name": "tcaSev",
-                "value": "Warning"
-            },
-
-            {
-                "name": "tcaVio",
-                "value": "3"
-            },
-
-            {
-                "serviceConfigurations": 
-                [
-                    [
-                        "PMRRCCONNESTABFAILCELLLATENCY",
-                        "LESS",
-                        "4",
-                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
-                    ],
-
-                    [
-                        "PMRAATTCBRA",
-                        "GREATER",
-                        "30",
-                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
-                    ]
-                ]
-            }
-        ],
-
-        "Srini": 
-        [
-            {
-                "name": "tname",
-                "value": "Srini"
-            },
-
-            {
-                "name": "tuuid",
-                "value": "8b5ba88d-f4b4-tf0e-50b1-78a5a7dd412d"
-            },
-
-            {
-                "name": "tnfc",
-                "value": "ENBE"
-            },
-
-            {
-                "name": "tcaEnab",
-                "value": "on"
-            },
-
-            {
-                "name": "tcaPol",
-                "value": "Policy2"
-            },
-
-            {
-                "name": "tcaPolId",
-                "value": "2"
-            },
-
-            {
-                "name": "tcaInt",
-                "value": "10"
-            },
-
-            {
-                "name": "tcaSev",
-                "value": "Critical"
-            },
-
-            {
-                "name": "tcaVio",
-                "value": "5"
-            },
-
-            {
-                "serviceConfigurations": 
-                [
-                    [
-                        "PMRRCCONNESTABFAILCELLLATENCY",
-                        "EQUAL",
-                        "3",
-                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
-                    ],
-
-                    [
-                        "PMRAATTCBRA",
-                        "GREATER",
-                        "30",
-                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
-                    ]
-                ]
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/src/test/resources/example/sdc/expected-result/all-sdc-services.json b/src/test/resources/example/sdc/expected-result/all-sdc-services.json
new file mode 100644
index 0000000..ea6efdd
--- /dev/null
+++ b/src/test/resources/example/sdc/expected-result/all-sdc-services.json
@@ -0,0 +1,6 @@
+{
+	"service": {
+		"4cc5b45a-1f63-4194-8100-cd8e14248c92": "vFirewall",
+		"c95b0e7c-c1f0-4287-9928-7964c5377a46": "vLoadBalancer"
+	}
+}
diff --git a/src/test/resources/example/tca-policy-req/blueprint-expected.yaml b/src/test/resources/example/tca-policy-req/blueprint-expected.yaml
index 2082e55..8739bb2 100644
--- a/src/test/resources/example/tca-policy-req/blueprint-expected.yaml
+++ b/src/test/resources/example/tca-policy-req/blueprint-expected.yaml
@@ -1,7 +1,7 @@
 tosca_definitions_version: cloudify_dsl_1_3
-imports: ['http://www.getcloudify.org/spec/cloudify/3.4/types.yaml', 'https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml',
-  'https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml',
-  'http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml']
+imports: ['http://www.getcloudify.org/spec/cloudify/3.4/types.yaml', 'https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml',
+  'https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml',
+  'http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml']
 inputs:
   location_id: {type: string}
   service_id: {type: string}
@@ -10,7 +10,7 @@
     type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure
     properties:
       location_id: {get_input: location_id}
-      scn_override: cdap_broker.solutioning-central.dcae.att.com
+      scn_override: cdap_broker.solutioning-central.dcae.onap.org
     interfaces:
       cloudify.interfaces.lifecycle: {}
   tca_tca:
@@ -21,15 +21,15 @@
         tcaVESAlertsTableName: TCAVESAlertsTable, tcaVESAlertsTableTTLSeconds: '1728000',
         tcaVESMessageStatusTableName: TCAVESMessageStatusTable, tcaVESMessageStatusTableTTLSeconds: '86400',
         thresholdCalculatorFlowletInstances: '2'}
-      app_preferences: {publisherContentType: application/json, publisherHostName: mrlocal-mtnjftle01.homer.att.com,
+      app_preferences: {publisherContentType: application/json, publisherHostName: mrlocal-mtnjftle01.onap.org,
         publisherHostPort: '3905', publisherMaxBatchSize: '10', publisherMaxRecoveryQueueSize: '100000',
-        publisherPollingInterval: '20000', publisherProtocol: https, publisherTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESPub,
-        publisherUserName: m00502@tca.af.dcae.att.com, publisherUserPassword: Te5021abc,
+        publisherPollingInterval: '20000', publisherProtocol: https, publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub,
+        publisherUserName: m00502@tca.af.dcae.onap.org, publisherUserPassword: Te5021abc,
         subscriberConsumerGroup: OpenDCAE-c12, subscriberConsumerId: c12, subscriberContentType: application/json,
-        subscriberHostName: mrlocal-mtnjftle01.homer.att.com, subscriberHostPort: '3905',
+        subscriberHostName: mrlocal-mtnjftle01.onap.org, subscriberHostPort: '3905',
         subscriberMessageLimit: '-1', subscriberPollingInterval: '20000', subscriberProtocol: https,
-        subscriberTimeoutMS: '-1', subscriberTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESSub,
-        subscriberUserName: m00502@tca.af.dcae.att.com, subscriberUserPassword: Te5021abc,
+        subscriberTimeoutMS: '-1', subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub,
+        subscriberUserName: m00502@tca.af.dcae.onap.org, subscriberUserPassword: Te5021abc,
         tca_policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta","thresholdValue":123,"direction":"GREATER_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta","thresholdValue":123,"direction":"GREATER_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"}]}]}'}
       artifact_name: dcae-analytics-tca
       artifact_version: 1.0.0
diff --git a/src/test/resources/example/tca-policy-req/blueprint-input.yaml b/src/test/resources/example/tca-policy-req/blueprint-input.yaml
index 9532225..101dc2c 100644
--- a/src/test/resources/example/tca-policy-req/blueprint-input.yaml
+++ b/src/test/resources/example/tca-policy-req/blueprint-input.yaml
@@ -1,9 +1,9 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
 - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml
-- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
-- http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml
+- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml
+- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
+- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml
 inputs:
   location_id:
     type: string
@@ -15,9 +15,10 @@
     properties:
       location_id:
         get_input: location_id
-      scn_override: cdap_broker.solutioning-central.dcae.att.com
+      scn_override: cdap_broker.solutioning-central.dcae.onap.org
     interfaces:
-      cloudify.interfaces.lifecycle: {}
+      cloudify.interfaces.lifecycle: {
+        }
   tca_tca:
     type: dcae.nodes.MicroService.cdap
     properties:
@@ -32,33 +33,35 @@
         thresholdCalculatorFlowletInstances: '2'
       app_preferences:
         publisherContentType: application/json
-        publisherHostName: mrlocal-mtnjftle01.homer.att.com
+        publisherHostName: mrlocal-mtnjftle01.onap.org
         publisherHostPort: '3905'
         publisherMaxBatchSize: '10'
         publisherMaxRecoveryQueueSize: '100000'
         publisherPollingInterval: '20000'
         publisherProtocol: https
-        publisherTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESPub
-        publisherUserName: m00502@tca.af.dcae.att.com
+        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub
+        publisherUserName: m00502@tca.af.dcae.onap.org
         publisherUserPassword: Te5021abc
         subscriberConsumerGroup: OpenDCAE-c12
         subscriberConsumerId: c12
         subscriberContentType: application/json
-        subscriberHostName: mrlocal-mtnjftle01.homer.att.com
+        subscriberHostName: mrlocal-mtnjftle01.onap.org
         subscriberHostPort: '3905'
         subscriberMessageLimit: '-1'
         subscriberPollingInterval: '20000'
         subscriberProtocol: https
         subscriberTimeoutMS: '-1'
-        subscriberTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESSub
-        subscriberUserName: m00502@tca.af.dcae.att.com
+        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub
+        subscriberUserName: m00502@tca.af.dcae.onap.org
         subscriberUserPassword: Te5021abc
-        tca_policy: 
+        tca_policy: null
       artifact_name: dcae-analytics-tca
       artifact_version: 1.0.0
       connections:
-        streams_publishes: []
-        streams_subscribes: []
+        streams_publishes: [
+          ]
+        streams_subscribes: [
+          ]
       jar_url: http://somejar
       location_id:
         get_input: location_id
@@ -76,4 +79,4 @@
       streamname: TCASubscriberOutputStream
     relationships:
     - target: cdap_host_host
-      type: dcae.relationships.component_contained_in
+      type: dcae.relationships.component_contained_in
\ No newline at end of file
diff --git a/src/test/resources/example/tca-policy-req/prop-text.json b/src/test/resources/example/tca-policy-req/prop-text.json
new file mode 100644
index 0000000..acaa889
--- /dev/null
+++ b/src/test/resources/example/tca-policy-req/prop-text.json
@@ -0,0 +1 @@
+{"global":[{"name":"service","value":["tosca_definitions_version: cloudify_dsl_1_3\r\nimports:\r\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\r\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\r\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\r\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\r\ninputs:\r\n  location_id:\r\n    type: string\r\n  service_id:\r\n    type: string\r\nnode_templates:\r\n  cdap_host_host:\r\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\r\n    properties:\r\n      location_id:\r\n        get_input: location_id\r\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\r\n    interfaces:\r\n      cloudify.interfaces.lifecycle: {\r\n        }\r\n  tca_tca:\r\n    type: dcae.nodes.MicroService.cdap\r\n    properties:\r\n      app_config:\r\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\r\n        appName: dcae-tca\r\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\r\n        tcaVESAlertsTableName: TCAVESAlertsTable\r\n        tcaVESAlertsTableTTLSeconds: '1728000'\r\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\r\n        tcaVESMessageStatusTableTTLSeconds: '86400'\r\n        thresholdCalculatorFlowletInstances: '2'\r\n      app_preferences:\r\n        publisherContentType: application/json\r\n        publisherHostName: mrlocal-mtnjftle01.onap.org\r\n        publisherHostPort: '3905'\r\n        publisherMaxBatchSize: '10'\r\n        publisherMaxRecoveryQueueSize: '100000'\r\n        publisherPollingInterval: '20000'\r\n        publisherProtocol: https\r\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\r\n        publisherUserName: m00502@tca.af.dcae.onap.org\r\n        publisherUserPassword: Te5021abc\r\n        subscriberConsumerGroup: OpenDCAE-c12\r\n        subscriberConsumerId: c12\r\n        subscriberContentType: application/json\r\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\r\n        subscriberHostPort: '3905'\r\n        subscriberMessageLimit: '-1'\r\n        subscriberPollingInterval: '20000'\r\n        subscriberProtocol: https\r\n        subscriberTimeoutMS: '-1'\r\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\r\n        subscriberUserName: m00502@tca.af.dcae.onap.org\r\n        subscriberUserPassword: Te5021abc\r\n        tca_policy: '{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\",\"thresholdValue\":123,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\",\"thresholdValue\":123,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"}]}]}'\r\n      artifact_name: dcae-analytics-tca\r\n      artifact_version: 1.0.0\r\n      connections:\r\n        streams_publishes: [\r\n          ]\r\n        streams_subscribes: [\r\n          ]\r\n      jar_url: http://somejar\r\n      location_id:\r\n        get_input: location_id\r\n      namespace: cdap_tca_hi_lo\r\n      programs:\r\n      - program_id: TCAVESCollectorFlow\r\n        program_type: flows\r\n      - program_id: TCADMaaPMRSubscriberWorker\r\n        program_type: workers\r\n      - program_id: TCADMaaPMRPublisherWorker\r\n        program_type: workers\r\n      service_component_type: cdap_app_tca\r\n      service_id:\r\n        get_input: service_id\r\n      streamname: TCASubscriberOutputStream\r\n    relationships:\r\n    - target: cdap_host_host\r\n      type: dcae.relationships.component_contained_in"]}]}
\ No newline at end of file
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index 54005ef..82cd999 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -77,42 +77,15 @@
 
 camel.springboot.consumer-template-cache-size=1000
 camel.springboot.producer-template-cache-size=1000
-camel.springboot.jmx-enabled=true
+camel.springboot.jmx-enabled=false
 camel.defaultthreadpool.poolsize=10
 camel.defaultthreadpool.maxpoolsize=20
 camel.defaultthreadpool.maxqueuesize=1000
 camel.defaultthreadpool.keepaliveTime=60
 camel.defaultthreadpool.rejectpolicy=CallerRuns
-
-#server.port=0
-#Camunda Process Engine DataSource connection Details
-spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.camunda.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647
-spring.datasource.camunda.username=camunda
-spring.datasource.camunda.password=e1bb2a8381d1aa6c09879bd627db3bb560ad29e8a3343fe6aa7e6a7ba622da4e
-spring.datasource.camunda.validationQuery=SELECT 1
-spring.datasource.camunda.validationQueryTimeout=20000
-spring.datasource.camunda.validationInterval=30000
-spring.datasource.camunda.testWhileIdle = true
-spring.datasource.camunda.minIdle = 0
-spring.datasource.camunda.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.camunda.testOnBorrow=true
-spring.datasource.camunda.ignoreExceptionOnPreLoad=true
-
-
-#Camunda application properties
-#Camunda history level
-camunda.bpm.history-level=none
-camunda.bpm.enabled=false
-camunda.bpm.jpa.enabled=false
-camunda.bpm.auto-deployment-enabled=false
-camunda.bpm.job-execution.active=false
-camunda.bpm.job-execution.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.metrics.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.database.schema-update=true
+#camel.springboot.xmlRoutes = false
+camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml
+#camel.springboot.typeConversion = false
 
 #clds datasource connection details
 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver