Index: tst_unhandled_message_log/test.py
===================================================================
diff -u -r106f98149c4637a7327c93bdcaa75f057ff4d40a -raf5ddd83e61fa82b9bc0d35f1651590e84147adb
--- tst_unhandled_message_log/test.py	(.../test.py)	(revision 106f98149c4637a7327c93bdcaa75f057ff4d40a)
+++ tst_unhandled_message_log/test.py	(.../test.py)	(revision af5ddd83e61fa82b9bc0d35f1651590e84147adb)
@@ -46,7 +46,8 @@
 ERROR_MESSAGE = {
     "0x1300"              : "Incorrect data length (9 of 32) for received Message with ID '0x1300'",
     "0x0900"              : "Incorrect data length (9 of 20) for received Message with ID '0x0900'",
-    "DATA_LENGTH_MISMATCH": "Not enough data from position 4 to the length of 4 to get data of type 'N5Types3S32E' in buffer 19.00.00.00.37 for value param"
+    "UNHANDLED_API"       : "Unhandled Message ID (HD)",
+    "DATA_LENGTH_MISMATCH": "N5Types3S32E"
     }
 
 
@@ -109,10 +110,8 @@
                             break
                         row_length = sum(1 for values in row)
                         try:
-                            if "'" in row[1]:
+                            if row[1] != None:
                                 return row[1]
-                            if "Unhandled Message ID (HD)" in row[1]:
-                                return True
                         except:
                             pass
                         count+=1
@@ -190,13 +189,14 @@
     #checking if the message is not in the unhandled (err)
     test.startSection("verify the message is not in unhandled (err)")
     hd_simulator.cmd_send_hd_general_response(message_id = 275, accepted = 1, reason = 1)
-    unhandled_status = get_error_message_from_log()
-    test.verify(unhandled_status == True, "message is not in unhandled.conf file. verified error message from .err file")
+    unhandled_message = get_error_message_from_log()
+    test.log(str(unhandled_message))
+    test.compare(unhandled_message, ERROR_MESSAGE["UNHANDLED_API"], "message is not in unhandled.conf file. verified error message from .err file")
     
     #checking if the message is not in the unhandled (err)
     hd_simulator.cmd_send_hd_general_response(message_id = 276, accepted = 1, reason = 1)
     unhandled_status = get_error_message_from_log()
-    test.verify(unhandled_status == True, "message is not in unhandled.conf file. verified error message from .err file")
+    test.compare(unhandled_message, ERROR_MESSAGE["UNHANDLED_API"], "message is not in unhandled.conf file. verified error message from .err file")
     test.endSection()
 
 
@@ -299,7 +299,8 @@
     payload = integer_to_bytearray(DUMMY_INT_VALUE_1)
     hd_simulator.cmd_send_hd_general_response(message_id = 204, accepted = 1, reason = 0, is_pure_data = True, has_parameters = True, parameters_payload = payload)
     error_message = get_error_message_from_log()
-    test.compare(error_message, ERROR_MESSAGE["DATA_LENGTH_MISMATCH"], "error code should be verified in log file")
+    expected_error_message = error_message.split("'", 1)[1].split("'")[0]
+    test.compare(expected_error_message, ERROR_MESSAGE["DATA_LENGTH_MISMATCH"], "error code should be verified in log file")
 
     utils.tstDone()