diff --git a/src/Hash2Pub/DHTProtocol.hs b/src/Hash2Pub/DHTProtocol.hs
index 29f3b13..d59ec06 100644
--- a/src/Hash2Pub/DHTProtocol.hs
+++ b/src/Hash2Pub/DHTProtocol.hs
@@ -12,6 +12,8 @@ module Hash2Pub.DHTProtocol
     , ActionPayload(..)
     , FediChordMessage(..)
     , maximumParts
+    , sendQueryIdMessage
+    , requestQueryID
     )
         where
 
@@ -152,7 +154,7 @@ requestQueryID ns targetID = do
               -- create connected sockets to all query targets
               sockets <- mapM (\resultNode -> mkSendSocket (domain resultNode) (dhtPort resultNode)) $ remoteNode <$> Set.toList nodeSet
               -- ToDo: make attempts and timeout configurable
-              queryThreads <- mapM (async . sendRequestTo 5000 3 (lookupMessage targetID)) sockets
+              queryThreads <- mapM (async . sendQueryIdMessage targetID ns) sockets
               -- ToDo: process results immediately instead of waiting for the last one to finish, see https://stackoverflow.com/a/38815224/9198613
               -- ToDo: exception handling, maybe log them
               responses <- (mconcat . fmap Set.elems) . rights <$> mapM waitCatch queryThreads
@@ -179,8 +181,15 @@ requestQueryID ns targetID = do
               -- if no FOUND, recursively call lookup again
               maybe (lookupLoop newLCache) pure foundResp
 
-    lookupMessage targetID rID = Request rID (toRemoteNodeState ns) 1 1 QueryID (Just $ pl ns targetID)
-    pl ns' targetID' = QueryIDRequestPayload { queryTargetID = targetID', queryLBestNodes = fromIntegral . lNumBestNodes $ ns }
+
+sendQueryIdMessage :: NodeID                        -- ^ target key ID to look up
+                   -> LocalNodeState                -- ^ node state of the node doing the query
+                   -> Socket                        -- ^ connected socket to use for sending
+                   -> IO (Set.Set FediChordMessage) -- ^ responses
+sendQueryIdMessage targetID ns = sendRequestTo 5000 3 (lookupMessage targetID ns)
+    where
+        lookupMessage targetID ns rID = Request rID (toRemoteNodeState ns) 1 1 QueryID (Just $ pl ns targetID)
+        pl ns' targetID' = QueryIDRequestPayload { queryTargetID = targetID', queryLBestNodes = fromIntegral . lNumBestNodes $ ns }
 
 -- | Generic function for sending a request over a connected socket and collecting the response.
 -- Serialises the message and tries to deliver its parts for a number of attempts within a specified timeout.