Index: unittests/tst_logging.cpp
===================================================================
diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f
--- unittests/tst_logging.cpp	(.../tst_logging.cpp)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
+++ unittests/tst_logging.cpp	(.../tst_logging.cpp)	(revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f)
@@ -39,7 +39,7 @@
     QCOMPARE( _Logger.init(), ! _Logger.init() );
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, "Event:  , Storage::Logger Initialized\n");
+    QCOMPARE(mContent, ",E,UI,Storage::Logger Initialized\n");
 }
 
 void tst_logging::cleanup()
@@ -59,15 +59,15 @@
     LOG_EVENT("1 - Event log has been created");
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, "Event:  , 1 - Event log has been created\n");
+    QCOMPARE(mContent, ",E,1 - Event log has been created\n");
 }
 
 void tst_logging::logDatum()
 {
     LOG_DATUM("3 - Datum log has been created");
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, "Datum:  , 3 - Datum log has been created\n");
+    QCOMPARE(mContent, ",D,3 - Datum log has been created\n");
 }
 
 void tst_logging::logError()
@@ -87,12 +87,12 @@
                        "Error:  , 4 - Datum log has been created\n");
 }
 
-void tst_logging::logError_gDisableHunhandledReport_False()
+void tst_logging::logError_gDisableUnhandledReport_False()
 {
-    gDisableHunhandledReport = false;
+    gDisableUnhandledReport = false;
     Can::MessageInterpreter iMsg;
     Can::Message msg;
-    msg.actionId = Gui::GuiActionType::idAlarmTriggered;
+    msg.actionId = Gui::GuiActionType::ID_AlarmTriggered;
     msg.data = {};
     iMsg.printUnhandled(msg);
     QString mContent;
@@ -102,12 +102,12 @@
     QCOMPARE(lines.first(), "Error:  , Unhandled Message ID (HD)");
 }
 
-void tst_logging::logError_gDisableHunhandledReport_True()
+void tst_logging::logError_gDisableUnhandledReport_True()
 {
-    gDisableHunhandledReport = true;
+    gDisableUnhandledReport = true;
     Can::MessageInterpreter iMsg;
     Can::Message msg;
-    msg.actionId = Gui::GuiActionType::idAlarmTriggered;
+    msg.actionId = Gui::GuiActionType::ID_AlarmTriggered;
     msg.data = {};
     iMsg.printUnhandled(msg);
     QString mContent;
@@ -117,10 +117,10 @@
 
 void tst_logging::logError_Unhandled_TreatmentState()
 {
-    gDisableHunhandledReport = false;
+    gDisableUnhandledReport = false;
     Can::MessageInterpreter iMsg;
     Can::Message msg;
-    msg.actionId = Gui::GuiActionType::idTreatmentState;
+    msg.actionId = Gui::GuiActionType::ID_TreatmentState;
     msg.data = {};
     QVariantList vData {};
     QVERIFY(iMsg.interpretMessage_HD(msg, vData));