Update and clean up HK and Local Pool Modules

unittests/devicehandler/TestDeviceHandlerBase.cpp

@@ -1,19 +1,26 @@
+#include <mock/HkReceiverMock.h>
+#include <mock/MessageQueueMock.h>
+
 #include <catch2/catch_test_macros.hpp>
 
 #include "DeviceHandlerCommander.h"
-#include "mocks/ComIFMock.h"
-#include "mocks/CookieIFMock.h"
-#include "mocks/DeviceFdirMock.h"
-#include "mocks/DeviceHandlerMock.h"
+#include "mock/ComIFMock.h"
+#include "mock/CookieIFMock.h"
+#include "mock/DeviceFdirMock.h"
+#include "mock/DeviceHandlerMock.h"
 #include "objects/systemObjectList.h"
 
 TEST_CASE("Device Handler Base", "[DeviceHandlerBase]") {
   // Will be deleted with DHB destructor
   auto* cookieIFMock = new CookieIFMock;
   ComIFMock comIF(objects::COM_IF_MOCK);
+  MessageQueueMock mqMock(1, MessageQueueIF::NO_QUEUE);
+  HkReceiverMock hkReceiver(1);
   DeviceFdirMock deviceFdirMock(objects::DEVICE_HANDLER_MOCK, objects::NO_OBJECT);
   DeviceHandlerMock deviceHandlerMock(objects::DEVICE_HANDLER_MOCK, objects::COM_IF_MOCK,
                                       cookieIFMock, &deviceFdirMock);
+  auto& hkHelper = deviceHandlerMock.getHkHelper();
+  hkHelper.setHkDestinationId(1);
   ReturnValue_t result = deviceHandlerMock.initialize();
   REQUIRE(result == returnvalue::OK);
   DeviceHandlerCommander deviceHandlerCommander(objects::DEVICE_HANDLER_COMMANDER);