Index: main.cpp
===================================================================
diff -u -rf623529d6ec25b555f3ac2248d71fc2b5e7063d6 -rc933552983a659ca4cc351ff4d43d07319adab1e
--- main.cpp	(.../main.cpp)	(revision f623529d6ec25b555f3ac2248d71fc2b5e7063d6)
+++ main.cpp	(.../main.cpp)	(revision c933552983a659ca4cc351ff4d43d07319adab1e)
@@ -25,18 +25,19 @@
 #include <QString>
 #include <QApplication>
 #include <QTranslator>
+#include <QCommandLineParser>
 
 // Project
 #include "maintimer.h"
 #include "caninterface.h"
-#include "messagehandler.h"
+#include "frameinterface.h"
+#include "messagedispatcher.h"
 #include "applicationcontroller.h"
-#include "guiglobals.h"
 #include "guicontroller.h"
 
 #ifdef UNIT_TEST
-    #include "unittests/unittests.h"
-    QTEST_MAIN(unittests)
+    #include TEST_CLASS_INCLUDE
+    QTEST_MAIN(TEST_CLASS_NAME)
 #else
 /*! \brief Application Initialization\n
  * Some part of the application need to be initialized out of any thread.
@@ -53,6 +54,17 @@
     QCoreApplication::setApplicationName(QLatin1String("Denali"));
     QCoreApplication::setOrganizationName(QLatin1String("Diality Inc."));
 
+    // Test code for debugging can messages
+    bool _consoleoutFrameInterface = false;
+    bool _consoleoutCanInterface   = false;
+    QStringList args = app.arguments();
+    if (args.length() >= 2) {
+        _consoleoutFrameInterface = args[1] == "1";
+    }
+    if (args.length() >= 3) {
+        _consoleoutCanInterface   = args[2] == "1";
+    }
+
     //! - Setting the application version regarding the Bamboo build number.
     QString ver_revis = QString("%1").arg(VER_REVIS);
     if (ver_revis.isEmpty()) {
@@ -75,15 +87,24 @@
 
     //! - Initializing CanBus Interface
     _CanInterface->init();
+    _CanInterface->enableConsoleOut(_consoleoutCanInterface);
 
     //! - Initializing CanBus Message Handler
-    _MessageHandler->init();
+    _FrameInterface->init();
 
+    //! - Initializing CanBus Message Dispatcher
+    _MessageDispatcher->init();
+    _MessageDispatcher->enableConsoleOut(_consoleoutFrameInterface);
+
     //! - Initializing Application Controller
     _ApplicationController->init();
+    QObject::connect(&app, &QApplication::aboutToQuit, []() {
+        emit _ApplicationController->quit();
+    });
     QObject::connect(_ApplicationController, &ApplicationController::quit, &app, [](int retcode) {
-        //qDebug() << "Application Terminated:" << retcode;
+        _CanInterface->quit();
         QCoreApplication::exit(retcode);
+        qDebug() << QObject::tr("Application Terminated: %1").arg(retcode);
     }, Qt::QueuedConnection);
 
     ////! - Initializing GUI Controller