Index: tst_cloud_sync_hd_opmodes/test.py
===================================================================
diff -u -re620a9fd664c96a736c0d7ca2ffe03d98a913189 -raa8fc1d9dd07fd00c14321863c0d090c3c887503
--- tst_cloud_sync_hd_opmodes/test.py	(.../test.py)	(revision e620a9fd664c96a736c0d7ca2ffe03d98a913189)
+++ tst_cloud_sync_hd_opmodes/test.py	(.../test.py)	(revision aa8fc1d9dd07fd00c14321863c0d090c3c887503)
@@ -53,74 +53,76 @@
     verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
+    
     test.startSection("Verifying message id, opmode, submode for Standby mode screen")
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
-    utils.waitForGUI(1)
+    utils.waitForGUI(2)
     test.log("Stand By mode")
     actual_inp_buf_data = utility.retrive_log_data(4)
-    test.log(str(actual_inp_buf_data[2]))
-    verify_log_response(actual_inp_buf_data[2],MESSAGE_STAND_BY_MODE)
-    verify_log_response_credentials(actual_inp_buf_data[3],DEVICE_CREDENTIALS_RESPONSE)
+    test.log(str(actual_inp_buf_data[0]))
+    verify_log_response(actual_inp_buf_data[0],MESSAGE_STAND_BY_MODE)
+    verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
     test.startSection("Verifying message id, opmode, submode for Treatment parameter mode screen")
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
-    utils.waitForGUI(1)
+    utils.waitForGUI(2)
     test.log("Treatment parameter mode")
-    actual_inp_buf_data = utility.retrive_log_data()
-    test.log(str(actual_inp_buf_data[4]))
-    verify_log_response(actual_inp_buf_data[4],MESSAGE_TPAR_MODE)
-    verify_log_response_credentials(actual_inp_buf_data[5],DEVICE_CREDENTIALS_RESPONSE)
+    actual_inp_buf_data = utility.retrive_log_data(6)
+    test.log(str(actual_inp_buf_data[0]))
+    verify_log_response(actual_inp_buf_data[0],MESSAGE_TPAR_MODE)
+    verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
     test.startSection("Verifying message id, opmode, submode for Pre -treatment mode screen")
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
-    utils.waitForGUI(1)
+    utils.waitForGUI(2)
     test.log("Pre - Treatment mode")
-    actual_inp_buf_data = utility.retrive_log_data()
-    test.log(str(actual_inp_buf_data[6]))
-    verify_log_response(actual_inp_buf_data[6],MESSAGE_PRETREATMENT_MODE)
-    verify_log_response_credentials(actual_inp_buf_data[7],DEVICE_CREDENTIALS_RESPONSE)
+    actual_inp_buf_data = utility.retrive_log_data(8)
+    test.log(str(actual_inp_buf_data[0]))
+    verify_log_response(actual_inp_buf_data[0],MESSAGE_PRETREATMENT_MODE)
+    verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
     test.startSection("Verifying message id, opmode, submode for Treatment mode screen")
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
-    utils.waitForGUI(1)
+    utils.waitForGUI(2)
     test.log("Treatment mode")
-    actual_inp_buf_data = utility.retrive_log_data()
-    test.log(str(actual_inp_buf_data[8]))
-    verify_log_response(actual_inp_buf_data[8],MESSAGE_TREATMENT_MODE)
-    verify_log_response_credentials(actual_inp_buf_data[9],DEVICE_CREDENTIALS_RESPONSE)
+    actual_inp_buf_data = utility.retrive_log_data(10)
+    test.log(str(actual_inp_buf_data[0]))
+    verify_log_response(actual_inp_buf_data[0],MESSAGE_TREATMENT_MODE)
+    verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
     test.startSection("Verifying message id, opmode, submode for Post treatment mode screen")
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_POST.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
-    utils.waitForGUI(1)
+    utils.waitForGUI(2)
     test.log("Post - treatment mode")
-    actual_inp_buf_data = utility.retrive_log_data()
-    test.log(str(actual_inp_buf_data[10]))
-    verify_log_response(actual_inp_buf_data[10],MESSAGE_POST_TREATMENT_MODE)
-    verify_log_response_credentials(actual_inp_buf_data[11],DEVICE_CREDENTIALS_RESPONSE)
+    actual_inp_buf_data = utility.retrive_log_data(12)
+    test.log(str(actual_inp_buf_data[0]))
+    verify_log_response(actual_inp_buf_data[0],MESSAGE_POST_TREATMENT_MODE)
+    verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
     test.startSection("Verifying message id, opmode, submode for Service mode screen")
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
-    utils.waitForGUI(1)
+    utils.waitForGUI(2)
     test.log("Service mode")
-    actual_inp_buf_data = utility.retrive_log_data()
-    test.log(str(actual_inp_buf_data[12]))
-    verify_log_response(actual_inp_buf_data[12],MESSAGE_SERVICE_MODE)
-    verify_log_response_credentials(actual_inp_buf_data[13],DEVICE_CREDENTIALS_RESPONSE)
+    actual_inp_buf_data = utility.retrive_log_data(14)
+    test.log(str(actual_inp_buf_data[0]))
+    verify_log_response(actual_inp_buf_data[0],MESSAGE_SERVICE_MODE)
+    verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
     test.startSection("Verifying message id, opmode, submode for Illegal transition screen")
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_NLEG.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)  
     mouseClick(waitForObjectExists(names.device_settings_screen))
+    utils.waitForGUI(2)
     test.log ("Illegal Transition")
-    actual_inp_buf_data = utility.retrive_log_data()
-    test.log(str(actual_inp_buf_data[14]))
-    verify_log_response(actual_inp_buf_data[14],MESSAGE_ILLEGAL_TRANSITION_MODE)
-    verify_log_response_credentials(actual_inp_buf_data[15],DEVICE_CREDENTIALS_RESPONSE)
+    actual_inp_buf_data = utility.retrive_log_data(16)
+    test.log(str(actual_inp_buf_data[0]))
+    verify_log_response(actual_inp_buf_data[0],MESSAGE_ILLEGAL_TRANSITION_MODE)
+    verify_log_response_credentials(actual_inp_buf_data[1],DEVICE_CREDENTIALS_RESPONSE)
     test.endSection()
     
     test.endSection()