diff --git a/services/tunnelbroker/test/DatabaseManagerTest.cpp b/services/tunnelbroker/test/DatabaseManagerTest.cpp
index cb42c9e78..ff2e59a2d 100644
--- a/services/tunnelbroker/test/DatabaseManagerTest.cpp
+++ b/services/tunnelbroker/test/DatabaseManagerTest.cpp
@@ -1,424 +1,462 @@
 #include "DatabaseManager.h"
 #include "ConfigManager.h"
 #include "Constants.h"
 #include "GlobalTools.h"
 #include "Tools.h"
 
 #include <gtest/gtest.h>
 
 #include <ctime>
 #include <memory>
 #include <string>
 
 using namespace comm::network;
 
 class DatabaseManagerTest : public testing::Test {
 protected:
   virtual void SetUp() {
     config::ConfigManager::getInstance().load();
     Aws::InitAPI({});
   }
 
   virtual void TearDown() {
     Aws::ShutdownAPI({});
   }
 };
 
 TEST_F(DatabaseManagerTest, PutAndFoundMessageItemsStaticDataIsSame) {
   const database::MessageItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "web:JouLWf84zqRIsjBdHLOcHS9M4eSCz7VF84wT1uOD83u1qxDAqmqI4swmxNINjuhd",
       "lYlNcO6RR4i9UW3G1DGjdJTRRGbqtPya2aj94ZRjIGZWoHwT5MB9ciAgnQf2VafYb9Tl"
       "8SZkX37tg4yZ9pOb4lqslY4g4h58OmWjumghVRvrPUZDalUuK8OLs1Qoengpu9wccxAk"
       "Bti2leDTNeiJDy36NnwS9aCIUc0ozsMvXfX1gWdBdmKbiRG1LvpNd6S7BNGG7Zly5zYj"
       "xz7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8G5"
       "RJ1NEDQq2q2FRfWjNHLhky92C2C7Nnfe4oVzSinfC1319uUkNLpSzI4MvEMi6g5Ukbl7"
       "iGhpnX7Hp4xpBL3h2IkvGviDRQ98UvW0ugwUuPxm1NOQpjLG5dPoqQ0jrMst0Bl5rgPw"
       "ajjNGsUWmp9r0ST0wRQXrQcY30PoSoqKSlCEgFMLzHWLrPQ86QFyCICismGSe7iBIqdD"
       "6d37StvXBzfJoZVU79UeOF2bFvb3DNoArEOe",
       "7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8");
   const size_t currentTimestamp = tools::getCurrentTimestamp();
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(item);
   std::shared_ptr<database::MessageItem> foundItem =
       database::DatabaseManager::getInstance().findMessageItem(
           item.getToDeviceID(), item.getMessageID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getFromDeviceID(), foundItem->getFromDeviceID());
   EXPECT_EQ(item.getToDeviceID(), foundItem->getToDeviceID());
   EXPECT_EQ(item.getPayload(), foundItem->getPayload());
   EXPECT_EQ(item.getBlobHashes(), foundItem->getBlobHashes());
   EXPECT_EQ(
       (foundItem->getExpire() >= static_cast<size_t>(std::time(0))) &&
           (foundItem->getExpire() <=
            static_cast<size_t>(std::time(0) + MESSAGE_RECORD_TTL)),
       true);
   EXPECT_EQ(
       foundItem->getCreatedAt() >= currentTimestamp &&
           foundItem->getCreatedAt() <= tools::getCurrentTimestamp(),
       true);
   database::DatabaseManager::getInstance().removeMessageItem(
       item.getToDeviceID(), item.getMessageID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundMessageItemsGeneratedDataIsSame) {
   const database::MessageItem item(
       tools::generateUUID(),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       "web:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       tools::generateRandomString(256),
       tools::generateRandomString(256));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(item);
   std::shared_ptr<database::MessageItem> foundItem =
       database::DatabaseManager::getInstance().findMessageItem(
           item.getToDeviceID(), item.getMessageID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getFromDeviceID(), foundItem->getFromDeviceID())
       << "Generated FromDeviceID \"" << item.getFromDeviceID()
       << "\" differs from what is found in the database "
       << foundItem->getFromDeviceID();
   EXPECT_EQ(item.getToDeviceID(), foundItem->getToDeviceID())
       << "Generated ToDeviceID \"" << item.getToDeviceID()
       << "\" differs from what is found in the database "
       << foundItem->getToDeviceID();
   EXPECT_EQ(item.getPayload(), foundItem->getPayload())
       << "Generated Payload \"" << item.getPayload()
       << "\" differs from what is found in the database "
       << foundItem->getPayload();
   EXPECT_EQ(item.getBlobHashes(), foundItem->getBlobHashes())
       << "Generated BlobHashes \"" << item.getBlobHashes()
       << "\" differs from what is found in the database "
       << foundItem->getBlobHashes();
   database::DatabaseManager::getInstance().removeMessageItem(
       item.getToDeviceID(), item.getMessageID());
 }
 
 TEST_F(DatabaseManagerTest, BatchPutAndFoundMessagesItemsCountIsSame) {
   const std::string receiverID =
       "web:JouLWf84zqRIsjBdHLOcHS9M4eSCz7VF84wT1uOD83u1qxDAqmqI4swmxNINjuhd";
   const size_t itemsSize = 29;
   std::vector<database::MessageItem> messageItems;
 
   for (size_t i = 1; i <= itemsSize; ++i) {
     database::MessageItem item{
         tools::generateUUID(),
         "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
         receiverID,
         tools::generateRandomString(256),
         tools::generateRandomString(256)};
     messageItems.push_back(item);
   }
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           messageItems[0].getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItemsByBatch(messageItems);
   std::vector<std::shared_ptr<database::MessageItem>> foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   EXPECT_EQ(foundItems.size(), itemsSize);
   for (std::shared_ptr<database::MessageItem> messageItem : foundItems) {
     database::DatabaseManager::getInstance().removeMessageItem(
         messageItem->getToDeviceID(), messageItem->getMessageID());
   }
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundDeviceSessionItemStaticDataIsSame) {
   const database::DeviceSessionItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
       "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
       "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
       "U3SK6SNKyR7anAXDVQIDAQAB",
       "hbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3",
       "phone",
       "ios:1.1.1",
       "iOS 99.99.99");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionItem(item);
   std::shared_ptr<database::DeviceSessionItem> foundItem =
       database::DatabaseManager::getInstance().findSessionItem(
           item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getDeviceID(), foundItem->getDeviceID());
   EXPECT_EQ(item.getPubKey(), foundItem->getPubKey());
   EXPECT_EQ(item.getNotifyToken(), foundItem->getNotifyToken());
   EXPECT_EQ(item.getDeviceType(), foundItem->getDeviceType());
   EXPECT_EQ(item.getAppVersion(), foundItem->getAppVersion());
   EXPECT_EQ(item.getDeviceOs(), foundItem->getDeviceOs());
   database::DatabaseManager::getInstance().removeSessionItem(
       item.getSessionID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundDeviceSessionItemGeneratedDataIsSame) {
   const database::DeviceSessionItem item(
       tools::generateUUID(),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       tools::generateRandomString(451),
       tools::generateRandomString(64),
       tools::generateRandomString(12),
       tools::generateRandomString(12),
       tools::generateRandomString(12));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionItem(item);
   std::shared_ptr<database::DeviceSessionItem> foundItem =
       database::DatabaseManager::getInstance().findSessionItem(
           item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getDeviceID(), foundItem->getDeviceID())
       << "Generated DeviceID \"" << item.getDeviceID()
       << "\" differs from what is found in the database "
       << foundItem->getDeviceID();
   EXPECT_EQ(item.getPubKey(), foundItem->getPubKey())
       << "Generated PubKey \"" << item.getPubKey()
       << "\" differs from what is found in the database "
       << foundItem->getPubKey();
   EXPECT_EQ(item.getNotifyToken(), foundItem->getNotifyToken())
       << "Generated NotifyToken \"" << item.getNotifyToken()
       << "\" differs from what is found in the database "
       << foundItem->getNotifyToken();
   EXPECT_EQ(item.getDeviceType(), foundItem->getDeviceType())
       << "Generated DeviceType \"" << item.getDeviceType()
       << "\" differs from what is found in the database "
       << foundItem->getDeviceType();
   EXPECT_EQ(item.getAppVersion(), foundItem->getAppVersion())
       << "Generated AppVersion \"" << item.getAppVersion()
       << "\" differs from what is found in the database "
       << foundItem->getAppVersion();
   EXPECT_EQ(item.getDeviceOs(), foundItem->getDeviceOs())
       << "Generated DeviceOS \"" << item.getDeviceOs()
       << "\" differs from what is found in the database "
       << foundItem->getDeviceOs();
   database::DatabaseManager::getInstance().removeSessionItem(
       item.getSessionID());
 }
 
 TEST_F(DatabaseManagerTest, UpdateIsOnlineDeviceSessionItem) {
   const database::DeviceSessionItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
       "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
       "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
       "U3SK6SNKyR7anAXDVQIDAQAB",
       "hbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3",
       "phone",
       "ios:1.1.1",
       "iOS 99.99.99");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionItem(item);
   std::shared_ptr<database::DeviceSessionItem> foundItem =
       database::DatabaseManager::getInstance().findSessionItem(
           item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_FALSE(foundItem->getIsOnline());
 
   database::DatabaseManager::getInstance().updateSessionItemIsOnline(
       item.getSessionID(), true);
   foundItem = database::DatabaseManager::getInstance().findSessionItem(
       item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_TRUE(foundItem->getIsOnline());
 
   database::DatabaseManager::getInstance().removeSessionItem(
       item.getSessionID());
 }
 
+TEST_F(DatabaseManagerTest, UpdateNotifTokenInDeviceSessionItem) {
+  const database::DeviceSessionItem item(
+      "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
+      "mobile:"
+      "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
+      "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
+      "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
+      "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
+      "U3SK6SNKyR7anAXDVQIDAQAB",
+      "hbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3",
+      "phone",
+      "ios:1.1.1",
+      "iOS 99.99.99");
+  EXPECT_EQ(
+      database::DatabaseManager::getInstance().isTableAvailable(
+          item.getTableName()),
+      true);
+  database::DatabaseManager::getInstance().putSessionItem(item);
+  std::shared_ptr<database::DeviceSessionItem> foundItem =
+      database::DatabaseManager::getInstance().findSessionItem(
+          item.getSessionID());
+  EXPECT_NE(foundItem, nullptr);
+  EXPECT_EQ(foundItem->getNotifyToken(), item.getNotifyToken());
+
+  const std::string newToken =
+      "HDVRgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVGHT";
+  database::DatabaseManager::getInstance().updateSessionItemDeviceToken(
+      item.getSessionID(), newToken);
+
+  foundItem = database::DatabaseManager::getInstance().findSessionItem(
+      item.getSessionID());
+  EXPECT_NE(foundItem, nullptr);
+  EXPECT_EQ(foundItem->getNotifyToken(), newToken);
+
+  database::DatabaseManager::getInstance().removeSessionItem(
+      item.getSessionID());
+}
+
 TEST_F(DatabaseManagerTest, PutAndFoundSessionSignItemStaticDataIsSame) {
   const database::SessionSignItem item(
       "bB3OSLdKlY60KPBpw6VoGKX7Lmw3SA07FmNhnqnclvVeaxXueAQ0dpQSpiQTtlGn",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionSignItem(item);
   std::shared_ptr<database::SessionSignItem> foundItem =
       database::DatabaseManager::getInstance().findSessionSignItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getSign(), foundItem->getSign());
   database::DatabaseManager::getInstance().removeSessionSignItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundSessionSignItemGeneratedDataIsSame) {
   const database::SessionSignItem item(
       tools::generateRandomString(SIGNATURE_REQUEST_LENGTH),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionSignItem(item);
   std::shared_ptr<database::SessionSignItem> foundItem =
       database::DatabaseManager::getInstance().findSessionSignItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr) << "Item with the key of deviceID \""
                                 << item.getDeviceID() << "\" is not found";
   EXPECT_EQ(item.getSign(), foundItem->getSign())
       << "Generated signature value \"" << item.getSign()
       << "\" is not equal of \"" + foundItem->getSign() +
           "\" from the database value";
   database::DatabaseManager::getInstance().removeSessionSignItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundPublicKeyItemsStaticDataIsSame) {
   const database::PublicKeyItem item(
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
       "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
       "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
       "U3SK6SNKyR7anAXDVQIDAQAB");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putPublicKeyItem(item);
   std::shared_ptr<database::PublicKeyItem> foundItem =
       database::DatabaseManager::getInstance().findPublicKeyItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getPublicKey(), foundItem->getPublicKey());
   database::DatabaseManager::getInstance().removePublicKeyItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundPublicKeyItemsGeneratedDataIsSame) {
   const database::PublicKeyItem item(
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       tools::generateRandomString(451));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putPublicKeyItem(item);
   std::shared_ptr<database::PublicKeyItem> foundItem =
       database::DatabaseManager::getInstance().findPublicKeyItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getPublicKey(), foundItem->getPublicKey())
       << "Generated PublicKey \"" << item.getPublicKey()
       << "\" differs from what is found in the database "
       << foundItem->getPublicKey();
   database::DatabaseManager::getInstance().removePublicKeyItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundByReceiverMessageItemsDataIsSame) {
   const std::string receiverID =
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm";
   const database::MessageItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       receiverID,
       "lYlNcO6RR4i9UW3G1DGjdJTRRGbqtPya2aj94ZRjIGZWoHwT5MB9ciAgnQf2VafYb9Tl"
       "8SZkX37tg4yZ9pOb4lqslY4g4h58OmWjumghVRvrPUZDalUuK8OLs1Qoengpu9wccxAk"
       "Bti2leDTNeiJDy36NnwS9aCIUc0ozsMvXfX1gWdBdmKbiRG1LvpNd6S7BNGG7Zly5zYj"
       "xz7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8G5"
       "RJ1NEDQq2q2FRfWjNHLhky92C2C7Nnfe4oVzSinfC1319uUkNLpSzI4MvEMi6g5Ukbl7"
       "iGhpnX7Hp4xpBL3h2IkvGviDRQ98UvW0ugwUuPxm1NOQpjLG5dPoqQ0jrMst0Bl5rgPw"
       "ajjNGsUWmp9r0ST0wRQXrQcY30PoSoqKSlCEgFMLzHWLrPQ86QFyCICismGSe7iBIqdD"
       "6d37StvXBzfJoZVU79UeOF2bFvb3DNoArEOe",
       "7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(item);
   std::vector<std::shared_ptr<database::MessageItem>> foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   EXPECT_NE(foundItems.size(), 0);
   EXPECT_EQ(item.getFromDeviceID(), foundItems[0]->getFromDeviceID());
   EXPECT_EQ(item.getToDeviceID(), foundItems[0]->getToDeviceID());
   EXPECT_EQ(item.getPayload(), foundItems[0]->getPayload());
   EXPECT_EQ(item.getBlobHashes(), foundItems[0]->getBlobHashes());
   EXPECT_EQ(
       (foundItems[0]->getExpire() >= static_cast<size_t>(std::time(0))) &&
           (foundItems[0]->getExpire() <=
            static_cast<size_t>(std::time(0) + MESSAGE_RECORD_TTL)),
       true);
   database::DatabaseManager::getInstance().removeMessageItem(
       item.getToDeviceID(), item.getMessageID());
 }
 
 TEST_F(DatabaseManagerTest, RemoveMessageItemsInBatch) {
   const size_t randomStringSize = 256;
   const std::string receiverID =
       "mobile:EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm";
   const database::MessageItem messageFirstToRemove(
       tools::generateUUID(),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       receiverID,
       tools::generateRandomString(randomStringSize),
       tools::generateRandomString(randomStringSize));
   const database::MessageItem messageSecondToRemove(
       tools::generateUUID(),
       "web:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       receiverID,
       tools::generateRandomString(randomStringSize),
       tools::generateRandomString(randomStringSize));
   const database::MessageItem messageThirdToNotRemove(
       tools::generateUUID(),
       "web:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       receiverID,
       tools::generateRandomString(randomStringSize),
       tools::generateRandomString(randomStringSize));
 
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           messageFirstToRemove.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(messageFirstToRemove);
   database::DatabaseManager::getInstance().putMessageItem(
       messageSecondToRemove);
   database::DatabaseManager::getInstance().putMessageItem(
       messageThirdToNotRemove);
   std::vector<std::shared_ptr<database::MessageItem>> foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   EXPECT_EQ(foundItems.size(), 3)
       << "Items count found by receiverID after insert is not equal to 3";
   std::vector<std::string> messageIDs = {
       messageFirstToRemove.getMessageID(),
       messageSecondToRemove.getMessageID()};
   database::DatabaseManager::getInstance().removeMessageItemsByIDsForDeviceID(
       messageIDs, receiverID);
   foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   // `messageThirdToNotRemove` must not be removed and must be persisted
   EXPECT_EQ(foundItems.size(), 1)
       << "Items found by receiverID is not equal to 1 after calling "
          "`removeMessageItemsByIDsForDeviceID`. The one message must be "
          "persisted.";
   database::DatabaseManager::getInstance().removeMessageItem(
       messageThirdToNotRemove.getToDeviceID(),
       messageThirdToNotRemove.getMessageID());
 }