Index: unittests/tst_logging.cpp
===================================================================
diff -u -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f -r56e378f7504701b9e9a9dccaf205aef2fd52c58e
--- unittests/tst_logging.cpp	(.../tst_logging.cpp)	(revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f)
+++ unittests/tst_logging.cpp	(.../tst_logging.cpp)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
@@ -2,13 +2,14 @@
  *
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
- *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,
- *          IN PART OR IN WHOLE,
- *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file    tst_logging.cpp
- * \date    01/07/2020
- * \author  Behrouz NematiPour
+ * \file tst_logging.cpp
+ * \author (last) Behrouz NematiPour
+ * \date (last) 30-Jul-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 08-Jan-2020
  *
  */
 #include "tst_logging.h"
@@ -72,19 +73,19 @@
 
 void tst_logging::logError()
 {
-    LOG_ERROR("2 - Error log has been created");
+    LOG_DEBUG("2 - Error log has been created");
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, "Error:  , 2 - Error log has been created\n");
+    QCOMPARE(mContent, ",2 - Error log has been created\n");
 }
 
 void tst_logging::logUnknown()
 {
     emit Storage::Logger::I().didLog("4 - Datum log has been created", Storage::Logger::LogType::eLogType_Count);
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, "Error:  , Incorrect type of logging\n"
-                       "Error:  , 4 - Datum log has been created\n");
+    QCOMPARE(mContent, ",Incorrect type of logging 3\n"
+                       ",4 - Datum log has been created\n");
 }
 
 void tst_logging::logError_gDisableUnhandledReport_False()
@@ -99,7 +100,7 @@
     FileHandler::read(_Logger._logFileName, mContent);
     QStringList lines = mContent.split("\n");
     QVERIFY(lines.count());
-    QCOMPARE(lines.first(), "Error:  , Unhandled Message ID (HD)");
+    QCOMPARE(lines.first(), ",Unhandled Message ID (HD)");
 }
 
 void tst_logging::logError_gDisableUnhandledReport_True()
@@ -115,20 +116,20 @@
     QCOMPARE(mContent, "");
 }
 
-void tst_logging::logError_Unhandled_TreatmentState()
+void tst_logging::logError_Unhandled_TreatmentStates()
 {
     gDisableUnhandledReport = false;
     Can::MessageInterpreter iMsg;
     Can::Message msg;
-    msg.actionId = Gui::GuiActionType::ID_TreatmentState;
+    msg.actionId = Gui::GuiActionType::ID_TreatmentStates;
     msg.data = {};
     QVariantList vData {};
-    QVERIFY(iMsg.interpretMessage_HD(msg, vData));
+    QVERIFY(! iMsg.interpretMessage_HD(msg, vData));
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
     QStringList lines = mContent.split("\n");
     QVERIFY(lines.count());
-    QCOMPARE(lines.first(), "Error:  , Unhandled Message ID (HD)");
+    QCOMPARE(lines.first(), ",Incorrect data length for received Message with ID '0x0F00'");
 }
 
 void tst_logging::setLogPath_F()