diff --git a/liblogosdelivery/liblogosdelivery.nim b/liblogosdelivery/liblogosdelivery.nim
index 5e088c311..001f793a7 100644
--- a/liblogosdelivery/liblogosdelivery.nim
+++ b/liblogosdelivery/liblogosdelivery.nim
@@ -1,6 +1,7 @@
 import std/[atomics, options]
 import chronicles, chronos, chronos/threadsync, ffi
-import logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, ./declare_lib
+import
+  logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, ./declare_lib
 
 ################################################################################
 ## Include different APIs, i.e. all procs with {.ffi.} pragma
diff --git a/library/kernel_api/debug_node_api.nim b/library/kernel_api/debug_node_api.nim
index 0f1199797..bbce84939 100644
--- a/library/kernel_api/debug_node_api.nim
+++ b/library/kernel_api/debug_node_api.nim
@@ -9,7 +9,10 @@ import
   metrics,
   ffi
 import
-  logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, logos_delivery/waku/node/health_monitor, library/declare_lib
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/node/waku_node,
+  logos_delivery/waku/node/health_monitor,
+  library/declare_lib
 
 proc getMultiaddresses(node: WakuNode): seq[string] =
   return node.info().listenAddresses
diff --git a/library/kernel_api/peer_manager_api.nim b/library/kernel_api/peer_manager_api.nim
index 99693a7f3..a7dfe0a70 100644
--- a/library/kernel_api/peer_manager_api.nim
+++ b/library/kernel_api/peer_manager_api.nim
@@ -1,6 +1,10 @@
 import std/[sequtils, strutils, tables]
 import chronicles, chronos, results, options, json, ffi
-import logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, logos_delivery/waku/node/peer_manager, ../declare_lib
+import
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/node/waku_node,
+  logos_delivery/waku/node/peer_manager,
+  ../declare_lib
 
 type PeerInfo = object
   protocols: seq[string]
diff --git a/library/kernel_api/ping_api.nim b/library/kernel_api/ping_api.nim
index b885bee61..da830bc5d 100644
--- a/library/kernel_api/ping_api.nim
+++ b/library/kernel_api/ping_api.nim
@@ -1,7 +1,9 @@
 import std/[json, strutils]
 import chronos, results, ffi
 import libp2p/[protocols/ping, switch, multiaddress, multicodec]
-import logos_delivery/waku/[factory/waku, waku_core/peers, node/waku_node], library/declare_lib
+import
+  logos_delivery/waku/[factory/waku, waku_core/peers, node/waku_node],
+  library/declare_lib
 
 proc waku_ping_peer(
     ctx: ptr FFIContext[Waku],
diff --git a/logos_delivery/channels/reliable_channel.nim b/logos_delivery/channels/reliable_channel.nim
index e8c426b75..4f4851aca 100644
--- a/logos_delivery/channels/reliable_channel.nim
+++ b/logos_delivery/channels/reliable_channel.nim
@@ -277,7 +277,9 @@ proc onReadyToSend(
       MessageErrorEvent.emit(
         self.brokerCtx,
         MessageErrorEvent(
-          requestId: channelReqId, messageHash: "", error: "messaging send failed: " & error
+          requestId: channelReqId,
+          messageHash: "",
+          error: "messaging send failed: " & error,
         ),
       )
       self.markSegmentFailed(channelReqId)
diff --git a/logos_delivery/channels/reliable_channel_manager.nim b/logos_delivery/channels/reliable_channel_manager.nim
index 05fd6194b..a21dfc54e 100644
--- a/logos_delivery/channels/reliable_channel_manager.nim
+++ b/logos_delivery/channels/reliable_channel_manager.nim
@@ -23,8 +23,7 @@ export reliable_channel
 
 type ReliableChannelManager* = ref object
   channels: Table[ChannelId, ReliableChannel]
-  messagingClient: MessagingClient
-    ## Borrowed from the owning `Waku`.
+  messagingClient: MessagingClient ## Borrowed from the owning `Waku`.
   sendHandler: SendHandler
     ## Default egress dispatch for channels created through this manager.
     ## Constructed at mount time as a closure over `MessagingClient.send`
@@ -97,11 +96,7 @@ proc createReliableChannel*(
     epochPeriodSec: DefaultEpochPeriodSec, messagesPerEpoch: DefaultMessagesPerEpoch
   )
 
-  let effectiveSendHandler =
-    if sendHandler.isNil():
-      self.sendHandler
-    else:
-      sendHandler
+  let effectiveSendHandler = if sendHandler.isNil(): self.sendHandler else: sendHandler
 
   let chn = ReliableChannel.new(
     sendHandler = effectiveSendHandler,
diff --git a/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim
index c39bc4530..da636dbcb 100644
--- a/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim
+++ b/logos_delivery/messaging/delivery_service/not_delivered_storage/migrations.nim
@@ -1,7 +1,9 @@
 {.push raises: [].}
 
 import std/[tables, strutils, os], results, chronicles
-import logos_delivery/waku/common/databases/db_sqlite, logos_delivery/waku/common/databases/common
+import
+  logos_delivery/waku/common/databases/db_sqlite,
+  logos_delivery/waku/common/databases/common
 
 logScope:
   topics = "waku node delivery_service"
diff --git a/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim b/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
index 438309cce..852c33c9a 100644
--- a/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
+++ b/logos_delivery/messaging/delivery_service/not_delivered_storage/not_delivered_storage.nim
@@ -9,7 +9,9 @@
 
 import results
 import
-  logos_delivery/waku/common/databases/db_sqlite, logos_delivery/waku/waku_core/message/message, ./migrations
+  logos_delivery/waku/common/databases/db_sqlite,
+  logos_delivery/waku/waku_core/message/message,
+  ./migrations
 
 const NotDeliveredMessagesDbUrl = "not-delivered-messages.db"
 
diff --git a/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim b/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim
index 56b000a45..e56536baa 100644
--- a/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim
+++ b/logos_delivery/messaging/delivery_service/send_service/delivery_task.nim
@@ -1,6 +1,9 @@
 import std/[options, times], chronos
 import brokers/broker_context
-import logos_delivery/waku/waku_core, logos_delivery/waku/api/types, logos_delivery/waku/requests/node_requests
+import
+  logos_delivery/waku/waku_core,
+  logos_delivery/waku/api/types,
+  logos_delivery/waku/requests/node_requests
 
 type DeliveryState* {.pure.} = enum
   Entry
diff --git a/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim b/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim
index 75311065d..100c27f52 100644
--- a/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim
+++ b/logos_delivery/messaging/delivery_service/send_service/lightpush_processor.nim
@@ -1,7 +1,10 @@
 import chronicles, chronos, results
 import std/options
 import brokers/broker_context
-import logos_delivery/waku/node/peer_manager, logos_delivery/waku/waku_core, logos_delivery/waku/waku_lightpush/[common, client, rpc]
+import
+  logos_delivery/waku/node/peer_manager,
+  logos_delivery/waku/waku_core,
+  logos_delivery/waku/waku_lightpush/[common, client, rpc]
 
 import ./[delivery_task, send_processor]
 
diff --git a/logos_delivery/waku/common/callbacks.nim b/logos_delivery/waku/common/callbacks.nim
index 34d8c2af1..9935a8d76 100644
--- a/logos_delivery/waku/common/callbacks.nim
+++ b/logos_delivery/waku/common/callbacks.nim
@@ -1,4 +1,6 @@
-import logos_delivery/waku/waku_enr/capabilities, logos_delivery/waku/waku_rendezvous/waku_peer_record
+import
+  logos_delivery/waku/waku_enr/capabilities,
+  logos_delivery/waku/waku_rendezvous/waku_peer_record
 
 type GetShards* = proc(): seq[uint16] {.closure, gcsafe, raises: [].}
 
diff --git a/logos_delivery/waku/discovery/waku_discv5.nim b/logos_delivery/waku/discovery/waku_discv5.nim
index 4fb5a82e2..d1b22a6d4 100644
--- a/logos_delivery/waku/discovery/waku_discv5.nim
+++ b/logos_delivery/waku/discovery/waku_discv5.nim
@@ -10,7 +10,9 @@ import
   eth/keys as eth_keys,
   eth/p2p/discoveryv5/node,
   eth/p2p/discoveryv5/protocol
-import logos_delivery/waku/[net/auto_port, node/peer_manager/peer_manager, waku_core, waku_enr]
+import
+  logos_delivery/waku/
+    [net/auto_port, node/peer_manager/peer_manager, waku_core, waku_enr]
 
 export protocol, waku_enr
 
diff --git a/logos_delivery/waku/factory/internal_config.nim b/logos_delivery/waku/factory/internal_config.nim
index da01ebd49..a3306eadc 100644
--- a/logos_delivery/waku/factory/internal_config.nim
+++ b/logos_delivery/waku/factory/internal_config.nim
@@ -8,7 +8,9 @@ import
   std/[options, sequtils, net],
   results
 
-import logos_delivery/waku/[common/utils/nat, net/net_config, waku_enr, waku_core], ./waku_conf
+import
+  logos_delivery/waku/[common/utils/nat, net/net_config, waku_enr, waku_core],
+  ./waku_conf
 
 proc tryBuildEnrRecord(
     conf: WakuConf, netConfig: NetConfig, multiaddrs: seq[MultiAddress]
diff --git a/logos_delivery/waku/node/waku_metrics.nim b/logos_delivery/waku/node/waku_metrics.nim
index 16ca85aa5..feb767878 100644
--- a/logos_delivery/waku/node/waku_metrics.nim
+++ b/logos_delivery/waku/node/waku_metrics.nim
@@ -2,7 +2,8 @@
 
 import chronicles, chronos, metrics, metrics/chronos_httpserver
 import
-  logos_delivery/waku/[net/auto_port, waku_rln_relay/protocol_metrics as rln_metrics, utils/collector],
+  logos_delivery/waku/
+    [net/auto_port, waku_rln_relay/protocol_metrics as rln_metrics, utils/collector],
   ./peer_manager,
   ./node_telemetry,
   ./waku_node
diff --git a/logos_delivery/waku/requests/health_requests.nim b/logos_delivery/waku/requests/health_requests.nim
index bd98f426b..1c9ed4d70 100644
--- a/logos_delivery/waku/requests/health_requests.nim
+++ b/logos_delivery/waku/requests/health_requests.nim
@@ -1,7 +1,8 @@
 import brokers/request_broker
 
 import logos_delivery/waku/api/types
-import logos_delivery/waku/node/health_monitor/[protocol_health, topic_health, health_report]
+import
+  logos_delivery/waku/node/health_monitor/[protocol_health, topic_health, health_report]
 import logos_delivery/waku/waku_core/topics
 import logos_delivery/waku/common/waku_protocol
 
diff --git a/logos_delivery/waku/rest_api/endpoint/builder.nim b/logos_delivery/waku/rest_api/endpoint/builder.nim
index 32cc3f2f1..6762aebdf 100644
--- a/logos_delivery/waku/rest_api/endpoint/builder.nim
+++ b/logos_delivery/waku/rest_api/endpoint/builder.nim
@@ -12,7 +12,8 @@ import
   logos_delivery/waku/rest_api/endpoint/debug/handlers as rest_debug_endpoint,
   logos_delivery/waku/rest_api/endpoint/relay/handlers as rest_relay_endpoint,
   logos_delivery/waku/rest_api/endpoint/filter/handlers as rest_filter_endpoint,
-  logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers as rest_legacy_lightpush_endpoint,
+  logos_delivery/waku/rest_api/endpoint/legacy_lightpush/handlers as
+    rest_legacy_lightpush_endpoint,
   logos_delivery/waku/rest_api/endpoint/lightpush/handlers as rest_lightpush_endpoint,
   logos_delivery/waku/rest_api/endpoint/store/handlers as rest_store_endpoint,
   logos_delivery/waku/rest_api/endpoint/health/handlers as rest_health_endpoint,
diff --git a/tests/api/test_api_health.nim b/tests/api/test_api_health.nim
index 753516598..e38439cbd 100644
--- a/tests/api/test_api_health.nim
+++ b/tests/api/test_api_health.nim
@@ -8,7 +8,8 @@ import ../testlib/[common, wakucore, wakunode, testasync]
 import
   logos_delivery,
   logos_delivery/waku/[waku_node, waku_core, waku_relay/protocol],
-  logos_delivery/waku/node/health_monitor/[topic_health, health_status, protocol_health, health_report],
+  logos_delivery/waku/node/health_monitor/
+    [topic_health, health_status, protocol_health, health_report],
   logos_delivery/waku/requests/health_requests,
   logos_delivery/waku/requests/node_requests,
   logos_delivery/waku/events/health_events,
diff --git a/tests/common/test_sqlite_migrations.nim b/tests/common/test_sqlite_migrations.nim
index a781da4aa..438c97096 100644
--- a/tests/common/test_sqlite_migrations.nim
+++ b/tests/common/test_sqlite_migrations.nim
@@ -1,7 +1,8 @@
 {.used.}
 
 import std/[strutils, os], results, testutils/unittests
-import logos_delivery/waku/common/databases/db_sqlite {.all.}, ../waku_archive/archive_utils
+import
+  logos_delivery/waku/common/databases/db_sqlite {.all.}, ../waku_archive/archive_utils
 
 template sourceDir(): string =
   currentSourcePath.rsplit(DirSep, 1)[0]
diff --git a/tests/incentivization/test_poc_reputation.nim b/tests/incentivization/test_poc_reputation.nim
index d87c92a66..f64947614 100644
--- a/tests/incentivization/test_poc_reputation.nim
+++ b/tests/incentivization/test_poc_reputation.nim
@@ -1,6 +1,8 @@
 import std/options, testutils/unittests, chronos, web3
 
-import logos_delivery/waku/incentivization/reputation_manager, logos_delivery/waku/waku_lightpush_legacy/rpc
+import
+  logos_delivery/waku/incentivization/reputation_manager,
+  logos_delivery/waku/waku_lightpush_legacy/rpc
 
 suite "Waku Incentivization PoC Reputation":
   var manager {.threadvar.}: ReputationManager
diff --git a/tests/node/peer_manager/peer_store/test_migrations.nim b/tests/node/peer_manager/peer_store/test_migrations.nim
index 3d08992ec..7925af92d 100644
--- a/tests/node/peer_manager/peer_store/test_migrations.nim
+++ b/tests/node/peer_manager/peer_store/test_migrations.nim
@@ -7,7 +7,9 @@ import
 
 import std/[tables, strutils, os], results, chronicles
 
-import logos_delivery/waku/common/databases/db_sqlite, logos_delivery/waku/common/databases/common
+import
+  logos_delivery/waku/common/databases/db_sqlite,
+  logos_delivery/waku/common/databases/common
 
 suite "Migrations":
   test "migrate ok":
diff --git a/tests/node/peer_manager/peer_store/test_peer_storage.nim b/tests/node/peer_manager/peer_store/test_peer_storage.nim
index db8bcd324..aaee96ab3 100644
--- a/tests/node/peer_manager/peer_store/test_peer_storage.nim
+++ b/tests/node/peer_manager/peer_store/test_peer_storage.nim
@@ -1,6 +1,8 @@
 import results, testutils/unittests
 
-import logos_delivery/waku/node/peer_manager/peer_store/peer_storage, logos_delivery/waku/waku_core/peers
+import
+  logos_delivery/waku/node/peer_manager/peer_store/peer_storage,
+  logos_delivery/waku/waku_core/peers
 
 suite "PeerStorage":
   var peerStorage {.threadvar.}: PeerStorage
diff --git a/tests/node/peer_manager/peer_store/test_waku_peer_storage.nim b/tests/node/peer_manager/peer_store/test_waku_peer_storage.nim
index af09b343f..e7dd2a151 100644
--- a/tests/node/peer_manager/peer_store/test_waku_peer_storage.nim
+++ b/tests/node/peer_manager/peer_store/test_waku_peer_storage.nim
@@ -7,7 +7,9 @@ import
   eth/p2p/discoveryv5/enr,
   nimcrypto/utils
 
-import logos_delivery/waku/waku_core/peers, logos_delivery/waku/node/peer_manager/peer_store/waku_peer_storage
+import
+  logos_delivery/waku/waku_core/peers,
+  logos_delivery/waku/node/peer_manager/peer_store/waku_peer_storage
 
 proc `==`(a, b: RemotePeerInfo): bool =
   let comparisons = @[
diff --git a/tests/node/test_wakunode_lightpush.nim b/tests/node/test_wakunode_lightpush.nim
index cc18b8000..be36b8d98 100644
--- a/tests/node/test_wakunode_lightpush.nim
+++ b/tests/node/test_wakunode_lightpush.nim
@@ -8,7 +8,8 @@ import
   libp2p/crypto/crypto
 
 import
-  logos_delivery/waku/[waku_core, node/peer_manager, waku_node, waku_lightpush, waku_rln_relay],
+  logos_delivery/waku/
+    [waku_core, node/peer_manager, waku_node, waku_lightpush, waku_rln_relay],
   ../testlib/[wakucore, wakunode, testasync, futures],
   ../resources/payloads,
   ../waku_rln_relay/[rln/waku_rln_relay_utils, utils_onchain]
diff --git a/tests/node/utils.nim b/tests/node/utils.nim
index 88694dc96..e6addf9cf 100644
--- a/tests/node/utils.nim
+++ b/tests/node/utils.nim
@@ -1,6 +1,7 @@
 import std/options, results
 import
-  logos_delivery/waku/[node/peer_manager, node/waku_node, waku_enr/sharding, common/enr/typed_record],
+  logos_delivery/waku/
+    [node/peer_manager, node/waku_node, waku_enr/sharding, common/enr/typed_record],
   ../testlib/[wakucore]
 
 proc relayShards*(node: WakuNode): RelayShards =
diff --git a/tests/test_message_cache.nim b/tests/test_message_cache.nim
index f86e4dd73..10dcd2e66 100644
--- a/tests/test_message_cache.nim
+++ b/tests/test_message_cache.nim
@@ -1,7 +1,10 @@
 {.used.}
 
 import std/[sets, random], results, stew/byteutils, testutils/unittests
-import logos_delivery/waku/waku_core, logos_delivery/waku/rest_api/message_cache, ./testlib/wakucore
+import
+  logos_delivery/waku/waku_core,
+  logos_delivery/waku/rest_api/message_cache,
+  ./testlib/wakucore
 
 randomize()
 
diff --git a/tests/test_relay_peer_exchange.nim b/tests/test_relay_peer_exchange.nim
index 4fd9e79d2..058576d4c 100644
--- a/tests/test_relay_peer_exchange.nim
+++ b/tests/test_relay_peer_exchange.nim
@@ -7,7 +7,11 @@ import
   libp2p/peerid,
   libp2p/protocols/pubsub/gossipsub
 
-import logos_delivery/waku/waku_core, logos_delivery/waku/waku_node, ./testlib/wakucore, ./testlib/wakunode
+import
+  logos_delivery/waku/waku_core,
+  logos_delivery/waku/waku_node,
+  ./testlib/wakucore,
+  ./testlib/wakunode
 
 procSuite "Relay (GossipSub) Peer Exchange":
   asyncTest "Mount relay without peer exchange handler":
diff --git a/tests/test_utils_compat.nim b/tests/test_utils_compat.nim
index b910f3201..aa353f8e5 100644
--- a/tests/test_utils_compat.nim
+++ b/tests/test_utils_compat.nim
@@ -1,7 +1,11 @@
 {.used.}
 
 import testutils/unittests
-import results, logos_delivery/waku/waku_core/message, logos_delivery/waku/waku_core/time, ./testlib/common
+import
+  results,
+  logos_delivery/waku/waku_core/message,
+  logos_delivery/waku/waku_core/time,
+  ./testlib/common
 
 suite "Waku Payload":
   test "Encode/Decode waku message with timestamp":
diff --git a/tests/test_waku_protobufs.nim b/tests/test_waku_protobufs.nim
index 741ef3eb2..d893f0fde 100644
--- a/tests/test_waku_protobufs.nim
+++ b/tests/test_waku_protobufs.nim
@@ -2,7 +2,10 @@
 
 import std/[options, sequtils, tables], testutils/unittests, chronos, chronicles
 import
-  logos_delivery/waku/waku_metadata, logos_delivery/waku/waku_metadata/rpc, ./testlib/wakucore, ./testlib/wakunode
+  logos_delivery/waku/waku_metadata,
+  logos_delivery/waku/waku_metadata/rpc,
+  ./testlib/wakucore,
+  ./testlib/wakunode
 
 procSuite "Waku Protobufs":
   # TODO: Missing test coverage in many encode/decode protobuf functions
diff --git a/tests/test_wakunode.nim b/tests/test_wakunode.nim
index 1e79cfc1b..574e35d7b 100644
--- a/tests/test_wakunode.nim
+++ b/tests/test_wakunode.nim
@@ -17,7 +17,9 @@ import
   eth/p2p/discoveryv5/enr,
   eth/net/utils
 import
-  logos_delivery/waku/[waku_core, waku_node, node/peer_manager], ./testlib/wakucore, ./testlib/wakunode
+  logos_delivery/waku/[waku_core, waku_node, node/peer_manager],
+  ./testlib/wakucore,
+  ./testlib/wakunode
 
 suite "WakuNode":
   asyncTest "Protocol matcher works as expected":
diff --git a/tests/waku_archive/test_driver_queue_index.nim b/tests/waku_archive/test_driver_queue_index.nim
index 85490fc07..eb1584ec2 100644
--- a/tests/waku_archive/test_driver_queue_index.nim
+++ b/tests/waku_archive/test_driver_queue_index.nim
@@ -1,7 +1,9 @@
 {.used.}
 
 import std/random, testutils/unittests
-import logos_delivery/waku/waku_core, logos_delivery/waku/waku_archive/driver/queue_driver/index
+import
+  logos_delivery/waku/waku_core,
+  logos_delivery/waku/waku_archive/driver/queue_driver/index
 
 var rng = initRand()
 
diff --git a/tests/waku_archive/test_partition_manager.nim b/tests/waku_archive/test_partition_manager.nim
index ebc02a0f3..e612c88e3 100644
--- a/tests/waku_archive/test_partition_manager.nim
+++ b/tests/waku_archive/test_partition_manager.nim
@@ -1,7 +1,9 @@
 {.used.}
 
 import testutils/unittests, chronos
-import logos_delivery/waku/waku_archive/driver/postgres_driver/partitions_manager, logos_delivery/waku/waku_core/time
+import
+  logos_delivery/waku/waku_archive/driver/postgres_driver/partitions_manager,
+  logos_delivery/waku/waku_core/time
 
 suite "Partition Manager":
   test "Calculate end partition time":
diff --git a/tests/waku_enr/utils.nim b/tests/waku_enr/utils.nim
index 32d472d85..c9948e268 100644
--- a/tests/waku_enr/utils.nim
+++ b/tests/waku_enr/utils.nim
@@ -6,7 +6,9 @@ import
   libp2p/crypto/crypto as libp2p_keys,
   eth/keys as eth_keys
 
-import logos_delivery/waku/[waku_enr, discovery/waku_discv5, waku_enr/sharding], ../testlib/wakucore
+import
+  logos_delivery/waku/[waku_enr, discovery/waku_discv5, waku_enr/sharding],
+  ../testlib/wakucore
 
 proc newTestEnrRecord*(
     privKey: libp2p_keys.PrivateKey,
diff --git a/tests/waku_filter_v2/test_waku_client.nim b/tests/waku_filter_v2/test_waku_client.nim
index 9e74562fd..c5bd3c558 100644
--- a/tests/waku_filter_v2/test_waku_client.nim
+++ b/tests/waku_filter_v2/test_waku_client.nim
@@ -6,7 +6,8 @@ import
   logos_delivery/waku/node/peer_manager,
   logos_delivery/waku/waku_node,
   logos_delivery/waku/waku_core,
-  logos_delivery/waku/waku_filter_v2/[common, client, subscriptions, protocol, rpc_codec],
+  logos_delivery/waku/waku_filter_v2/
+    [common, client, subscriptions, protocol, rpc_codec],
   ../testlib/[wakucore, testasync, testutils, futures, sequtils, wakunode],
   ./waku_filter_utils,
   ../resources/payloads
diff --git a/tests/waku_keystore/utils.nim b/tests/waku_keystore/utils.nim
index e041a4e85..9d86df9bb 100644
--- a/tests/waku_keystore/utils.nim
+++ b/tests/waku_keystore/utils.nim
@@ -4,7 +4,8 @@
 import stint
 
 import
-  logos_delivery/waku/[waku_keystore/protocol_types, waku_rln_relay, waku_rln_relay/protocol_types]
+  logos_delivery/waku/
+    [waku_keystore/protocol_types, waku_rln_relay, waku_rln_relay/protocol_types]
 
 func fromStrToBytesLe*(v: string): seq[byte] =
   try:
diff --git a/tests/waku_lightpush/test_ratelimit.nim b/tests/waku_lightpush/test_ratelimit.nim
index f32a45fbf..8500ad8b2 100644
--- a/tests/waku_lightpush/test_ratelimit.nim
+++ b/tests/waku_lightpush/test_ratelimit.nim
@@ -3,7 +3,8 @@
 import std/options, testutils/unittests, chronos, libp2p/crypto/crypto
 
 import
-  logos_delivery/waku/[node/peer_manager, waku_core, waku_lightpush, waku_lightpush/client],
+  logos_delivery/waku/
+    [node/peer_manager, waku_core, waku_lightpush, waku_lightpush/client],
   ../testlib/wakucore,
   ./lightpush_utils
 
diff --git a/tests/waku_rln_relay/rln/test_wrappers.nim b/tests/waku_rln_relay/rln/test_wrappers.nim
index dc95d198b..8d969a31b 100644
--- a/tests/waku_rln_relay/rln/test_wrappers.nim
+++ b/tests/waku_rln_relay/rln/test_wrappers.nim
@@ -1,6 +1,9 @@
 import testutils/unittests, results
 
-import logos_delivery/waku/waku_rln_relay/rln, logos_delivery/waku/waku_rln_relay/rln/wrappers, ./waku_rln_relay_utils
+import
+  logos_delivery/waku/waku_rln_relay/rln,
+  logos_delivery/waku/waku_rln_relay/rln/wrappers,
+  ./waku_rln_relay_utils
 
 suite "membershipKeyGen":
   test "ok":
diff --git a/tests/waku_store/store_utils.nim b/tests/waku_store/store_utils.nim
index 893b03ae9..1e241ec95 100644
--- a/tests/waku_store/store_utils.nim
+++ b/tests/waku_store/store_utils.nim
@@ -3,7 +3,8 @@
 import std/options, chronos, chronicles
 
 import
-  logos_delivery/waku/[node/peer_manager, waku_store, waku_store/client], ../testlib/[common, wakucore]
+  logos_delivery/waku/[node/peer_manager, waku_store, waku_store/client],
+  ../testlib/[common, wakucore]
 
 proc newTestWakuStore*(
     switch: Switch, handler: StoreQueryRequestHandler
diff --git a/tests/waku_store/test_client.nim b/tests/waku_store/test_client.nim
index 9f77f12e2..ce9f5f802 100644
--- a/tests/waku_store/test_client.nim
+++ b/tests/waku_store/test_client.nim
@@ -3,7 +3,8 @@
 import std/[options, sets], testutils/unittests, chronos, libp2p/crypto/crypto
 
 import
-  logos_delivery/waku/[node/peer_manager, waku_core, waku_store, waku_store/client, common/paging],
+  logos_delivery/waku/
+    [node/peer_manager, waku_core, waku_store, waku_store/client, common/paging],
   ../testlib/[wakucore, testasync, futures],
   ./store_utils
 
diff --git a/tests/wakunode2/test_validators.nim b/tests/wakunode2/test_validators.nim
index c0fbf9bab..dc6e8eb28 100644
--- a/tests/wakunode2/test_validators.nim
+++ b/tests/wakunode2/test_validators.nim
@@ -12,7 +12,8 @@ import
   libp2p/multihash,
   secp256k1
 import
-  logos_delivery/waku/[waku_core, node/peer_manager, waku_node, factory/validator_signed],
+  logos_delivery/waku/
+    [waku_core, node/peer_manager, waku_node, factory/validator_signed],
   tools/confutils/cli_args,
   ../testlib/wakucore,
   ../testlib/wakunode
diff --git a/tests/wakunode_rest/test_rest_debug_serdes.nim b/tests/wakunode_rest/test_rest_debug_serdes.nim
index 40c9725f1..f14912b85 100644
--- a/tests/wakunode_rest/test_rest_debug_serdes.nim
+++ b/tests/wakunode_rest/test_rest_debug_serdes.nim
@@ -1,7 +1,9 @@
 {.used.}
 
 import results, stew/byteutils, testutils/unittests, json_serialization
-import logos_delivery/waku/rest_api/endpoint/serdes, logos_delivery/waku/rest_api/endpoint/debug/types
+import
+  logos_delivery/waku/rest_api/endpoint/serdes,
+  logos_delivery/waku/rest_api/endpoint/debug/types
 
 suite "Waku v2 REST API - Debug -  serialization":
   suite "DebugWakuInfo - decode":
diff --git a/tests/wakunode_rest/test_rest_serdes.nim b/tests/wakunode_rest/test_rest_serdes.nim
index 86c14ee5b..12f0ae9da 100644
--- a/tests/wakunode_rest/test_rest_serdes.nim
+++ b/tests/wakunode_rest/test_rest_serdes.nim
@@ -1,7 +1,9 @@
 {.used.}
 
 import results, stew/byteutils, chronicles, unittest2, json_serialization
-import logos_delivery/waku/rest_api/endpoint/serdes, logos_delivery/waku/rest_api/endpoint/debug/types
+import
+  logos_delivery/waku/rest_api/endpoint/serdes,
+  logos_delivery/waku/rest_api/endpoint/debug/types
 
 # TODO: Decouple this test suite from the `debug_rest_interface` module by defining
 #  private custom types for this test suite module