Test env updates for dmaap messages in batch and for running external agent

Restructured and consolidated testcases

Various minor updates and adjustment to test functions

Change-Id: Ie796b04b7a12bbd410b56db19d718e1c5a0510de
Issue-ID: NONRTRIC-154
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
diff --git a/test/cr/cr.py b/test/cr/cr.py
index f65d7c0..105ccc2 100644
--- a/test/cr/cr.py
+++ b/test/cr/cr.py
@@ -90,7 +90,6 @@
     try:
         print("Received callback for id: "+id +", content-type="+request.content_type)
         try:
-            print("data:"+request.get_data)
             if (request.content_type == MIME_JSON):
                 msg = request.json
                 print("Payload(json): "+str(msg))
@@ -102,7 +101,7 @@
                 print("Payload(content-type="+request.content_type+"). Setting data to empty, quoted, string")
         except:
             msg="\"\""
-            print("Payload does not contain any json or text data, setting empty string as payload")
+            print("(Exception) Payload does not contain any json or text data, setting empty string as payload")
 
         cntr_msg_callbacks += 1
         if (id in msg_callbacks.keys()):