diff --git a/src/agent/agentService.ts b/src/agent/agentService.ts
index e16bd7feef..5b1fb52e7c 100644
--- a/src/agent/agentService.ts
+++ b/src/agent/agentService.ts
@@ -14,7 +14,10 @@ import { Sigchain } from '../sigchain';
 import { KeyManager } from '../keys';
 import { NotificationsManager } from '../notifications';
 import { ErrorGRPC } from '../grpc/errors';
-import { AgentServiceService, IAgentServiceServer } from '../proto/js/polykey/v1/agent_service_grpc_pb';
+import {
+  AgentServiceService,
+  IAgentServiceServer,
+} from '../proto/js/polykey/v1/agent_service_grpc_pb';
 import * as utilsPB from '../proto/js/polykey/v1/utils/utils_pb';
 import * as vaultsPB from '../proto/js/polykey/v1/vaults/vaults_pb';
 import * as nodesPB from '../proto/js/polykey/v1/nodes/nodes_pb';
@@ -50,10 +53,7 @@ function createAgentService({
 }): IAgentServiceServer {
   const agentService: IAgentServiceServer = {
     echo: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EchoMessage,
-        utilsPB.EchoMessage
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EchoMessage, utilsPB.EchoMessage>,
       callback: grpc.sendUnaryData<utilsPB.EchoMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EchoMessage();
@@ -61,10 +61,7 @@ function createAgentService({
       callback(null, response);
     },
     vaultsGitInfoGet: async (
-      call: grpc.ServerWritableStream<
-        vaultsPB.Vault,
-        vaultsPB.PackChunk
-      >,
+      call: grpc.ServerWritableStream<vaultsPB.Vault, vaultsPB.PackChunk>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
       const request = call.request;
@@ -101,10 +98,7 @@ function createAgentService({
       await genWritable.next(null);
     },
     vaultsGitPackGet: async (
-      call: grpc.ServerDuplexStream<
-        vaultsPB.PackChunk,
-        vaultsPB.PackChunk
-      >,
+      call: grpc.ServerDuplexStream<vaultsPB.PackChunk, vaultsPB.PackChunk>,
     ) => {
       const write = promisify(call.write).bind(call);
       const clientBodyBuffers: Buffer[] = [];
@@ -232,10 +226,7 @@ function createAgentService({
      * Retrieves the ChainDataEncoded of this node.
      */
     nodesChainDataGet: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        nodesPB.ChainData
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, nodesPB.ChainData>,
       callback: grpc.sendUnaryData<nodesPB.ChainData>,
     ): Promise<void> => {
       const response = new nodesPB.ChainData();
@@ -265,10 +256,7 @@ function createAgentService({
       callback(null, response);
     },
     nodesHolePunchMessageSend: async (
-      call: grpc.ServerUnaryCall<
-        nodesPB.Relay,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<nodesPB.Relay, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EmptyMessage();
@@ -344,10 +332,7 @@ function createAgentService({
       }
     },
     nodesCrossSignClaim: async (
-      call: grpc.ServerDuplexStream<
-        nodesPB.CrossSign,
-        nodesPB.CrossSign
-      >,
+      call: grpc.ServerDuplexStream<nodesPB.CrossSign, nodesPB.CrossSign>,
     ) => {
       // TODO: Move all "await genClaims.throw" to a final catch(). Wrap this
       // entire thing in a try block. And re-throw whatever error is caught
diff --git a/src/agent/index.ts b/src/agent/index.ts
index 6fcd2f00e3..8a9bebd205 100644
--- a/src/agent/index.ts
+++ b/src/agent/index.ts
@@ -1,3 +1,6 @@
-export { default as createAgentService, AgentServiceService } from './agentService';
+export {
+  default as createAgentService,
+  AgentServiceService,
+} from './agentService';
 export { default as GRPCClientAgent } from './GRPCClientAgent';
 export * as errors from './errors';
diff --git a/src/claims/utils.ts b/src/claims/utils.ts
index eb40dda2a5..ca1f5f153e 100644
--- a/src/claims/utils.ts
+++ b/src/claims/utils.ts
@@ -457,9 +457,7 @@ function reconstructClaimIntermediary(
  * Reconstructs a ClaimEncoded object from a ClaimMessage (i.e. after GRPC
  * transport).
  */
-function reconstructClaimEncoded(
-  claimMsg: nodesPB.AgentClaim,
-): ClaimEncoded {
+function reconstructClaimEncoded(claimMsg: nodesPB.AgentClaim): ClaimEncoded {
   const claim: ClaimEncoded = {
     payload: claimMsg.getPayload(),
     signatures: claimMsg.getSignaturesList().map((signatureMsg) => {
diff --git a/src/client/clientService.ts b/src/client/clientService.ts
index b239e563aa..28502537a4 100644
--- a/src/client/clientService.ts
+++ b/src/client/clientService.ts
@@ -11,7 +11,10 @@ import type { GRPCServer } from '../grpc';
 
 import { promisify } from 'util';
 import * as grpc from '@grpc/grpc-js';
-import { ClientServiceService, IClientServiceServer } from '../proto/js/polykey/v1/client_service_grpc_pb';
+import {
+  ClientServiceService,
+  IClientServiceServer,
+} from '../proto/js/polykey/v1/client_service_grpc_pb';
 import * as utilsPB from '../proto/js/polykey/v1/utils/utils_pb';
 import * as vaultsPB from '../proto/js/polykey/v1/vaults/vaults_pb';
 import * as nodesPB from '../proto/js/polykey/v1/nodes/nodes_pb';
@@ -106,10 +109,7 @@ function createClientService({
       sessionManager,
     }),
     nodesList: async (
-      call: grpc.ServerWritableStream<
-        utilsPB.EmptyMessage,
-        nodesPB.Node
-      >,
+      call: grpc.ServerWritableStream<utilsPB.EmptyMessage, nodesPB.Node>,
     ): Promise<void> => {
       // Call.request // PROCESS THE REQEUST MESSAGE
       const nodeMessage = new nodesPB.Node();
@@ -119,10 +119,7 @@ function createClientService({
       call.end();
     },
     agentStop: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       try {
diff --git a/src/client/index.ts b/src/client/index.ts
index b6bc3bfab4..44ff1f832e 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -1,4 +1,7 @@
-export { default as createClientService, ClientServiceService } from './clientService';
+export {
+  default as createClientService,
+  ClientServiceService,
+} from './clientService';
 export { default as GRPCClientClient } from './GRPCClientClient';
 export * as errors from './errors';
 export * as utils from './utils';
diff --git a/src/client/rpcEcho.ts b/src/client/rpcEcho.ts
index 18c6892245..ebd9b92130 100644
--- a/src/client/rpcEcho.ts
+++ b/src/client/rpcEcho.ts
@@ -13,10 +13,7 @@ const createEchoRPC = ({
 }) => {
   return {
     echo: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EchoMessage,
-        utilsPB.EchoMessage
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EchoMessage, utilsPB.EchoMessage>,
       callback: grpc.sendUnaryData<utilsPB.EchoMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EchoMessage();
diff --git a/src/client/rpcGestalts.ts b/src/client/rpcGestalts.ts
index 5931bc2730..2dd4fd25e9 100644
--- a/src/client/rpcGestalts.ts
+++ b/src/client/rpcGestalts.ts
@@ -51,10 +51,7 @@ const createGestaltsRPC = ({
       callback(null, response);
     },
     gestaltsGestaltGetByIdentity: async (
-      call: grpc.ServerUnaryCall<
-        identitiesPB.Provider,
-        gestaltsPB.Graph
-      >,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, gestaltsPB.Graph>,
       callback: grpc.sendUnaryData<gestaltsPB.Graph>,
     ): Promise<void> => {
       const response = new gestaltsPB.Graph();
@@ -77,10 +74,7 @@ const createGestaltsRPC = ({
       callback(null, response);
     },
     gestaltsGestaltList: async (
-      call: grpc.ServerWritableStream<
-        utilsPB.EmptyMessage,
-        gestaltsPB.Gestalt
-      >,
+      call: grpc.ServerWritableStream<utilsPB.EmptyMessage, gestaltsPB.Gestalt>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
       let gestaltMessage: gestaltsPB.Gestalt;
@@ -102,10 +96,7 @@ const createGestaltsRPC = ({
       }
     },
     gestaltsDiscoveryByNode: async (
-      call: grpc.ServerUnaryCall<
-        nodesPB.Node,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<nodesPB.Node, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const info = call.request;
@@ -129,10 +120,7 @@ const createGestaltsRPC = ({
       callback(null, emptyMessage);
     },
     gestaltsDiscoveryByIdentity: async (
-      call: grpc.ServerUnaryCall<
-        identitiesPB.Provider,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const info = call.request;
@@ -157,10 +145,7 @@ const createGestaltsRPC = ({
       callback(null, emptyMessage);
     },
     gestaltsActionsGetByNode: async (
-      call: grpc.ServerUnaryCall<
-        nodesPB.Node,
-        permissionsPB.Actions
-      >,
+      call: grpc.ServerUnaryCall<nodesPB.Node, permissionsPB.Actions>,
       callback: grpc.sendUnaryData<permissionsPB.Actions>,
     ): Promise<void> => {
       const info = call.request;
@@ -188,10 +173,7 @@ const createGestaltsRPC = ({
       callback(null, response);
     },
     gestaltsActionsGetByIdentity: async (
-      call: grpc.ServerUnaryCall<
-        identitiesPB.Provider,
-        permissionsPB.Actions
-      >,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, permissionsPB.Actions>,
       callback: grpc.sendUnaryData<permissionsPB.Actions>,
     ): Promise<void> => {
       const info = call.request;
@@ -222,10 +204,7 @@ const createGestaltsRPC = ({
       callback(null, response);
     },
     gestaltsActionsSetByNode: async (
-      call: grpc.ServerUnaryCall<
-        permissionsPB.ActionSet,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<permissionsPB.ActionSet, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const info = call.request;
@@ -259,10 +238,7 @@ const createGestaltsRPC = ({
       callback(null, response);
     },
     gestaltsActionsSetByIdentity: async (
-      call: grpc.ServerUnaryCall<
-        permissionsPB.ActionSet,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<permissionsPB.ActionSet, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const info = call.request;
@@ -301,10 +277,7 @@ const createGestaltsRPC = ({
       callback(null, response);
     },
     gestaltsActionsUnsetByNode: async (
-      call: grpc.ServerUnaryCall<
-        permissionsPB.ActionSet,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<permissionsPB.ActionSet, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const info = call.request;
@@ -338,10 +311,7 @@ const createGestaltsRPC = ({
       callback(null, response);
     },
     gestaltsActionsUnsetByIdentity: async (
-      call: grpc.ServerUnaryCall<
-        permissionsPB.ActionSet,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<permissionsPB.ActionSet, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const info = call.request;
diff --git a/src/client/rpcIdentities.ts b/src/client/rpcIdentities.ts
index 6783cde92a..db6addfff6 100644
--- a/src/client/rpcIdentities.ts
+++ b/src/client/rpcIdentities.ts
@@ -95,10 +95,7 @@ const createIdentitiesRPC = ({
       callback(null, response);
     },
     identitiesTokenGet: async (
-      call: grpc.ServerUnaryCall<
-        identitiesPB.Provider,
-        identitiesPB.Token
-      >,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, identitiesPB.Token>,
       callback: grpc.sendUnaryData<identitiesPB.Token>,
     ): Promise<void> => {
       const response = new identitiesPB.Token();
@@ -119,10 +116,7 @@ const createIdentitiesRPC = ({
       callback(null, response);
     },
     identitiesTokenDelete: async (
-      call: grpc.ServerUnaryCall<
-        identitiesPB.Provider,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EmptyMessage();
@@ -142,10 +136,7 @@ const createIdentitiesRPC = ({
       callback(null, response);
     },
     identitiesProvidersList: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        identitiesPB.Provider
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, identitiesPB.Provider>,
       callback: grpc.sendUnaryData<identitiesPB.Provider>,
     ): Promise<void> => {
       const response = new identitiesPB.Provider();
@@ -212,10 +203,7 @@ const createIdentitiesRPC = ({
      * Gets the first identityId of the local keynode.
      */
     identitiesInfoGet: async (
-      call: grpc.ServerUnaryCall<
-        identitiesPB.Provider,
-        identitiesPB.Provider
-      >,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, identitiesPB.Provider>,
       callback: grpc.sendUnaryData<identitiesPB.Provider>,
     ): Promise<void> => {
       try {
@@ -243,10 +231,7 @@ const createIdentitiesRPC = ({
      * Augments the keynode with a new identity.
      */
     identitiesClaim: async (
-      call: grpc.ServerUnaryCall<
-        identitiesPB.Provider,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<identitiesPB.Provider, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       // To augment a keynode we need a provider, generate an oauthkey and then
diff --git a/src/client/rpcKeys.ts b/src/client/rpcKeys.ts
index e913242723..c9e5128c73 100644
--- a/src/client/rpcKeys.ts
+++ b/src/client/rpcKeys.ts
@@ -29,10 +29,7 @@ const createKeysRPC = ({
 }) => {
   return {
     keysKeyPairRoot: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        keysPB.KeyPair
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, keysPB.KeyPair>,
       callback: grpc.sendUnaryData<keysPB.KeyPair>,
     ): Promise<void> => {
       const response = new keysPB.KeyPair();
@@ -47,10 +44,7 @@ const createKeysRPC = ({
       callback(null, response);
     },
     keysKeyPairReset: async (
-      call: grpc.ServerUnaryCall<
-        keysPB.Key,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<keysPB.Key, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EmptyMessage();
@@ -80,10 +74,7 @@ const createKeysRPC = ({
       callback(null, response);
     },
     keysKeyPairRenew: async (
-      call: grpc.ServerUnaryCall<
-        keysPB.Key,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<keysPB.Key, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EmptyMessage();
@@ -173,10 +164,7 @@ const createKeysRPC = ({
       callback(null, response);
     },
     keysVerify: async (
-      call: grpc.ServerUnaryCall<
-        keysPB.Crypto,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<keysPB.Crypto, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -197,10 +185,7 @@ const createKeysRPC = ({
       callback(null, response);
     },
     keysPasswordChange: async (
-      call: grpc.ServerUnaryCall<
-        sessionsPB.Password,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<sessionsPB.Password, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EmptyMessage();
@@ -217,10 +202,7 @@ const createKeysRPC = ({
       callback(null, response);
     },
     keysCertsGet: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        keysPB.Certificate
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, keysPB.Certificate>,
       callback: grpc.sendUnaryData<keysPB.Certificate>,
     ): Promise<void> => {
       const response = new keysPB.Certificate();
@@ -238,10 +220,7 @@ const createKeysRPC = ({
       callback(null, response);
     },
     keysCertsChainGet: async (
-      call: grpc.ServerWritableStream<
-        utilsPB.EmptyMessage,
-        keysPB.Certificate
-      >,
+      call: grpc.ServerWritableStream<utilsPB.EmptyMessage, keysPB.Certificate>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
       try {
diff --git a/src/client/rpcNodes.ts b/src/client/rpcNodes.ts
index 0c08f2341a..f2a8bea665 100644
--- a/src/client/rpcNodes.ts
+++ b/src/client/rpcNodes.ts
@@ -29,10 +29,7 @@ const createNodesRPC = ({
      * of the passed ID or host/port.
      */
     nodesAdd: async (
-      call: grpc.ServerUnaryCall<
-        nodesPB.NodeAddress,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<nodesPB.NodeAddress, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       const response = new utilsPB.EmptyMessage();
@@ -66,10 +63,7 @@ const createNodesRPC = ({
      * Checks if a remote node is online.
      */
     nodesPing: async (
-      call: grpc.ServerUnaryCall<
-        nodesPB.Node,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<nodesPB.Node, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -94,10 +88,7 @@ const createNodesRPC = ({
      * other node and host node.
      */
     nodesClaim: async (
-      call: grpc.ServerUnaryCall<
-        nodesPB.Claim,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<nodesPB.Claim, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -136,10 +127,7 @@ const createNodesRPC = ({
      * @throws ErrorNodeGraphNodeNotFound if node address cannot be found
      */
     nodesFind: async (
-      call: grpc.ServerUnaryCall<
-        nodesPB.Node,
-        nodesPB.NodeAddress
-      >,
+      call: grpc.ServerUnaryCall<nodesPB.Node, nodesPB.NodeAddress>,
       callback: grpc.sendUnaryData<nodesPB.NodeAddress>,
     ): Promise<void> => {
       const response = new nodesPB.NodeAddress();
@@ -154,9 +142,7 @@ const createNodesRPC = ({
         response
           .setNodeId(nodeId)
           .setAddress(
-            new nodesPB.Address()
-              .setHost(address.ip)
-              .setPort(address.port),
+            new nodesPB.Address().setHost(address.ip).setPort(address.port),
           );
       } catch (err) {
         callback(grpcUtils.fromError(err), response);
diff --git a/src/client/rpcNotifications.ts b/src/client/rpcNotifications.ts
index 008dc8969b..34d17c2c2a 100644
--- a/src/client/rpcNotifications.ts
+++ b/src/client/rpcNotifications.ts
@@ -18,10 +18,7 @@ const createNotificationsRPC = ({
 }) => {
   return {
     notificationsSend: async (
-      call: grpc.ServerUnaryCall<
-        notificationsPB.Send,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<notificationsPB.Send, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       try {
@@ -45,10 +42,7 @@ const createNotificationsRPC = ({
       callback(null, emptyMessage);
     },
     notificationsRead: async (
-      call: grpc.ServerUnaryCall<
-        notificationsPB.Read,
-        notificationsPB.List
-      >,
+      call: grpc.ServerUnaryCall<notificationsPB.Read, notificationsPB.List>,
       callback: grpc.sendUnaryData<notificationsPB.List>,
     ): Promise<void> => {
       const response = new notificationsPB.List();
@@ -76,8 +70,7 @@ const createNotificationsRPC = ({
 
         const notifMessages: Array<notificationsPB.Notification> = [];
         for (const notif of notifications) {
-          const notificationsMessage =
-            new notificationsPB.Notification();
+          const notificationsMessage = new notificationsPB.Notification();
           switch (notif.data.type) {
             case 'General': {
               const generalMessage = new notificationsPB.General();
@@ -109,10 +102,7 @@ const createNotificationsRPC = ({
       callback(null, response);
     },
     notificationsClear: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.EmptyMessage>,
     ): Promise<void> => {
       try {
diff --git a/src/client/rpcSession.ts b/src/client/rpcSession.ts
index 926c65f0bc..5ee13d430a 100644
--- a/src/client/rpcSession.ts
+++ b/src/client/rpcSession.ts
@@ -18,10 +18,7 @@ const createSessionRPC = ({
 }) => {
   return {
     sessionUnlock: async (
-      call: grpc.ServerUnaryCall<
-        sessionsPB.Password,
-        sessionsPB.Token
-      >,
+      call: grpc.ServerUnaryCall<sessionsPB.Password, sessionsPB.Token>,
       callback: grpc.sendUnaryData<sessionsPB.Token>,
     ): Promise<void> => {
       const response = new sessionsPB.Token();
@@ -40,10 +37,7 @@ const createSessionRPC = ({
       callback(null, response);
     },
     sessionRefresh: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        sessionsPB.Token
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, sessionsPB.Token>,
       callback: grpc.sendUnaryData<sessionsPB.Token>,
     ): Promise<void> => {
       const response = new sessionsPB.Token();
@@ -56,10 +50,7 @@ const createSessionRPC = ({
       callback(null, response);
     },
     sessionLockAll: async (
-      call: grpc.ServerUnaryCall<
-        utilsPB.EmptyMessage,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<utilsPB.EmptyMessage, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
diff --git a/src/client/rpcVaults.ts b/src/client/rpcVaults.ts
index fa91303b4f..bec554f8ea 100644
--- a/src/client/rpcVaults.ts
+++ b/src/client/rpcVaults.ts
@@ -24,10 +24,7 @@ const createVaultRPC = ({
 }) => {
   return {
     vaultsList: async (
-      call: grpc.ServerWritableStream<
-        utilsPB.EmptyMessage,
-        vaultsPB.List
-      >,
+      call: grpc.ServerWritableStream<utilsPB.EmptyMessage, vaultsPB.List>,
     ): Promise<void> => {
       // Call.on('error', (e) => console.error(e));
       // call.on('close', () => console.log('Got close'));
@@ -52,10 +49,7 @@ const createVaultRPC = ({
       }
     },
     vaultsCreate: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.Vault,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.Vault, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<vaultsPB.Vault>,
     ): Promise<void> => {
       const response = new vaultsPB.Vault();
@@ -101,10 +95,7 @@ const createVaultRPC = ({
       }
     },
     vaultsDelete: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.Vault,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.Vault, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const vaultMessage = call.request;
@@ -124,10 +115,7 @@ const createVaultRPC = ({
       }
     },
     vaultsClone: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.Clone,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.Clone, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -162,10 +150,7 @@ const createVaultRPC = ({
       }
     },
     vaultsPull: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.Pull,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.Pull, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -198,10 +183,7 @@ const createVaultRPC = ({
       }
     },
     vaultsScan: async (
-      call: grpc.ServerWritableStream<
-        nodesPB.Node,
-        vaultsPB.List
-      >,
+      call: grpc.ServerWritableStream<nodesPB.Node, vaultsPB.List>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
       const nodeId = makeNodeId(call.request.getNodeId());
@@ -225,10 +207,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsList: async (
-      call: grpc.ServerWritableStream<
-        vaultsPB.Vault,
-        secretsPB.Secret
-      >,
+      call: grpc.ServerWritableStream<vaultsPB.Vault, secretsPB.Secret>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
 
@@ -254,10 +233,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsMkdir: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.Mkdir,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.Mkdir, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -309,10 +285,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsDelete: async (
-      call: grpc.ServerUnaryCall<
-        secretsPB.Secret,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<secretsPB.Secret, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -338,10 +311,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsEdit: async (
-      call: grpc.ServerUnaryCall<
-        secretsPB.Secret,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<secretsPB.Secret, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -373,10 +343,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsGet: async (
-      call: grpc.ServerUnaryCall<
-        secretsPB.Secret,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<secretsPB.Secret, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<secretsPB.Secret>,
     ): Promise<void> => {
       const response = new secretsPB.Secret();
@@ -403,10 +370,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsRename: async (
-      call: grpc.ServerUnaryCall<
-        secretsPB.Rename,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<secretsPB.Rename, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -438,10 +402,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsNew: async (
-      call: grpc.ServerUnaryCall<
-        secretsPB.Secret,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<secretsPB.Secret, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -468,10 +429,7 @@ const createVaultRPC = ({
       }
     },
     vaultsSecretsNewDir: async (
-      call: grpc.ServerUnaryCall<
-        secretsPB.Directory,
-        utilsPB.EmptyMessage
-      >,
+      call: grpc.ServerUnaryCall<secretsPB.Directory, utilsPB.EmptyMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       const response = new utilsPB.StatusMessage();
@@ -497,10 +455,7 @@ const createVaultRPC = ({
       }
     },
     vaultsPermissionsSet: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.PermSet,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.PermSet, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       try {
@@ -531,10 +486,7 @@ const createVaultRPC = ({
       }
     },
     vaultsPermissionsUnset: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.PermUnset,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.PermUnset, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       try {
@@ -565,10 +517,7 @@ const createVaultRPC = ({
       }
     },
     vaultsPermissions: async (
-      call: grpc.ServerWritableStream<
-        vaultsPB.PermGet,
-        vaultsPB.Permission
-      >,
+      call: grpc.ServerWritableStream<vaultsPB.PermGet, vaultsPB.Permission>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
 
@@ -612,10 +561,7 @@ const createVaultRPC = ({
       }
     },
     vaultsVersion: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.Version,
-        vaultsPB.VersionResult
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.Version, vaultsPB.VersionResult>,
       callback: grpc.sendUnaryData<vaultsPB.VersionResult>,
     ): Promise<void> => {
       try {
@@ -658,10 +604,7 @@ const createVaultRPC = ({
       }
     },
     vaultsLog: async (
-      call: grpc.ServerWritableStream<
-        vaultsPB.Log,
-        vaultsPB.LogEntry
-      >,
+      call: grpc.ServerWritableStream<vaultsPB.Log, vaultsPB.LogEntry>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
       try {
diff --git a/src/nodes/NodeManager.ts b/src/nodes/NodeManager.ts
index b402a03655..cd011e109a 100644
--- a/src/nodes/NodeManager.ts
+++ b/src/nodes/NodeManager.ts
@@ -392,9 +392,7 @@ class NodeManager {
    * nodeConnection.start())
    */
   @ready(new nodesErrors.ErrorNodeManagerNotStarted())
-  public async relayHolePunchMessage(
-    message: nodesPB.Relay,
-  ): Promise<void> {
+  public async relayHolePunchMessage(message: nodesPB.Relay): Promise<void> {
     const conn = await this.getConnectionToNode(
       message.getTargetId() as NodeId,
     );
diff --git a/tests/agent/GRPCClientAgent.test.ts b/tests/agent/GRPCClientAgent.test.ts
index 56f51bbb15..615d5fe725 100644
--- a/tests/agent/GRPCClientAgent.test.ts
+++ b/tests/agent/GRPCClientAgent.test.ts
@@ -395,8 +395,7 @@ describe('GRPC agent', () => {
       const genClaims = client.nodesCrossSignClaim();
       expect(genClaims.stream.destroyed).toBe(false);
       // 2. X <- sends its intermediary signed claim <- Y
-      const crossSignMessageUndefinedSinglySignature =
-        new nodesPB.CrossSign();
+      const crossSignMessageUndefinedSinglySignature = new nodesPB.CrossSign();
       const intermediaryNoSignature = new nodesPB.ClaimIntermediary();
       crossSignMessageUndefinedSinglySignature.setSinglySignedClaim(
         intermediaryNoSignature,
diff --git a/tests/client/clientService.test.ts b/tests/client/clientService.test.ts
index 5690f37c3e..62867ce1f4 100644
--- a/tests/client/clientService.test.ts
+++ b/tests/client/clientService.test.ts
@@ -243,11 +243,10 @@ describe('Client service', () => {
       const token1 = res1.getToken() as SessionToken;
       const callCredentialsRefresh = testUtils.createCallCredentials(token1);
 
-      const sessionRefresh =
-        grpcUtils.promisifyUnaryCall<sessionsPB.Token>(
-          client,
-          client.sessionRefresh,
-        );
+      const sessionRefresh = grpcUtils.promisifyUnaryCall<sessionsPB.Token>(
+        client,
+        client.sessionRefresh,
+      );
 
       const emptyMessage = new utilsPB.EmptyMessage();
 
@@ -274,11 +273,10 @@ describe('Client service', () => {
       expect(res.getChallenge()).toBe('Hello');
 
       //Locking the session.
-      const sessionLockAll =
-        grpcUtils.promisifyUnaryCall<utilsPB.EchoMessage>(
-          client,
-          client.sessionLockAll,
-        );
+      const sessionLockAll = grpcUtils.promisifyUnaryCall<utilsPB.EchoMessage>(
+        client,
+        client.sessionLockAll,
+      );
 
       const emptyMessage = new utilsPB.EmptyMessage();
       await sessionLockAll(emptyMessage, callCredentials);
@@ -332,11 +330,10 @@ describe('Client service', () => {
     });
 
     test('should get vaults', async () => {
-      const listVaults =
-        grpcUtils.promisifyReadableStreamCall<vaultsPB.List>(
-          client,
-          client.vaultsList,
-        );
+      const listVaults = grpcUtils.promisifyReadableStreamCall<vaultsPB.List>(
+        client,
+        client.vaultsList,
+      );
 
       const vaultList = ['Vault1', 'Vault2', 'Vault3', 'Vault4', 'Vault5'];
 
@@ -372,11 +369,10 @@ describe('Client service', () => {
       );
     });
     test('should delete vaults', async () => {
-      const deleteVault =
-        grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
-          client,
-          client.vaultsDelete,
-        );
+      const deleteVault = grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
+        client,
+        client.vaultsDelete,
+      );
 
       const vaultList = ['Vault1', 'Vault2', 'Vault3', 'Vault4', 'Vault5'];
       const vaultList2 = ['Vault2', 'Vault3', 'Vault4', 'Vault5'];
@@ -460,11 +456,10 @@ describe('Client service', () => {
     test('should make a directory in a vault', async () => {
       const vaultName = 'MySecondVault' as VaultName;
 
-      const mkdirVault =
-        grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
-          client,
-          client.vaultsSecretsMkdir,
-        );
+      const mkdirVault = grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
+        client,
+        client.vaultsSecretsMkdir,
+      );
 
       const vault = await vaultManager.createVault(vaultName);
       const dirPath = 'dir/dir1/dir2';
@@ -599,11 +594,10 @@ describe('Client service', () => {
     test('should get secrets in a vault', async () => {
       const vaultName = 'MyFirstVault' as VaultName;
 
-      const getSecretVault =
-        grpcUtils.promisifyUnaryCall<secretsPB.Secret>(
-          client,
-          client.vaultsSecretsGet,
-        );
+      const getSecretVault = grpcUtils.promisifyUnaryCall<secretsPB.Secret>(
+        client,
+        client.vaultsSecretsGet,
+      );
 
       const vault = await vaultManager.createVault(vaultName);
 
@@ -878,11 +872,10 @@ describe('Client service', () => {
         // Creating the vault
         vault = await vaultManager.createVault(vaultName);
 
-        vaultsVersion =
-          grpcUtils.promisifyUnaryCall<vaultsPB.VersionResult>(
-            client,
-            client.vaultsVersion,
-          );
+        vaultsVersion = grpcUtils.promisifyUnaryCall<vaultsPB.VersionResult>(
+          client,
+          client.vaultsVersion,
+        );
       });
 
       afterEach(async () => {
@@ -1129,11 +1122,10 @@ describe('Client service', () => {
       let commit3Oid: string;
 
       beforeEach(async () => {
-        vaultLog =
-          grpcUtils.promisifyReadableStreamCall<vaultsPB.LogEntry>(
-            client,
-            client.vaultsLog,
-          );
+        vaultLog = grpcUtils.promisifyReadableStreamCall<vaultsPB.LogEntry>(
+          client,
+          client.vaultsLog,
+        );
 
         // Creating the vault
         vault = await vaultManager.createVault(vaultName);
@@ -1223,11 +1215,10 @@ describe('Client service', () => {
   });
   describe('keys', () => {
     test('should get root keypair', async () => {
-      const getRootKeyPair =
-        grpcUtils.promisifyUnaryCall<keysPB.KeyPair>(
-          client,
-          client.keysKeyPairRoot,
-        );
+      const getRootKeyPair = grpcUtils.promisifyUnaryCall<keysPB.KeyPair>(
+        client,
+        client.keysKeyPairRoot,
+      );
 
       const keyPair = keyManager.getRootKeyPairPem();
 
@@ -1239,17 +1230,15 @@ describe('Client service', () => {
       expect(key.getPublic()).toBe(keyPair.publicKey);
     });
     test('should reset root keypair', async () => {
-      const getRootKeyPair =
-        grpcUtils.promisifyUnaryCall<keysPB.KeyPair>(
-          client,
-          client.keysKeyPairRoot,
-        );
+      const getRootKeyPair = grpcUtils.promisifyUnaryCall<keysPB.KeyPair>(
+        client,
+        client.keysKeyPairRoot,
+      );
 
-      const resetKeyPair =
-        grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
-          client,
-          client.keysKeyPairReset,
-        );
+      const resetKeyPair = grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
+        client,
+        client.keysKeyPairReset,
+      );
 
       const keyPair = keyManager.getRootKeyPairPem();
       const nodeId1 = nodeManager.getNodeId();
@@ -1303,11 +1292,10 @@ describe('Client service', () => {
       };
     });
     test('should renew root keypair', async () => {
-      const renewKeyPair =
-        grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
-          client,
-          client.keysKeyPairRenew,
-        );
+      const renewKeyPair = grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
+        client,
+        client.keysKeyPairRenew,
+      );
 
       const rootKeyPair1 = keyManager.getRootKeyPairPem();
       const nodeId1 = nodeManager.getNodeId();
@@ -1357,17 +1345,15 @@ describe('Client service', () => {
       };
     });
     test('should encrypt and decrypt with root keypair', async () => {
-      const encryptWithKeyPair =
-        grpcUtils.promisifyUnaryCall<keysPB.Crypto>(
-          client,
-          client.keysEncrypt,
-        );
+      const encryptWithKeyPair = grpcUtils.promisifyUnaryCall<keysPB.Crypto>(
+        client,
+        client.keysEncrypt,
+      );
 
-      const decryptWithKeyPair =
-        grpcUtils.promisifyUnaryCall<keysPB.Crypto>(
-          client,
-          client.keysDecrypt,
-        );
+      const decryptWithKeyPair = grpcUtils.promisifyUnaryCall<keysPB.Crypto>(
+        client,
+        client.keysDecrypt,
+      );
 
       const plainText = Buffer.from('abc');
       const cryptoMessage = new keysPB.Crypto();
@@ -1387,11 +1373,10 @@ describe('Client service', () => {
       expect(plainText_.getData()).toBe(plainText.toString());
     });
     test('should encrypt and decrypt with root keypair', async () => {
-      const signWithKeyPair =
-        grpcUtils.promisifyUnaryCall<keysPB.Crypto>(
-          client,
-          client.keysSign,
-        );
+      const signWithKeyPair = grpcUtils.promisifyUnaryCall<keysPB.Crypto>(
+        client,
+        client.keysSign,
+      );
 
       const verifyWithKeyPair =
         grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
@@ -1502,22 +1487,20 @@ describe('Client service', () => {
       expect((await gen.next()).done).toBeTruthy();
     });
     test('should manipulate tokens for providers', async () => {
-      const putToken =
-        grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
-          client,
-          client.identitiesTokenPut,
-        );
+      const putToken = grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
+        client,
+        client.identitiesTokenPut,
+      );
 
       const getTokens = grpcUtils.promisifyUnaryCall<identitiesPB.Token>(
         client,
         client.identitiesTokenGet,
       );
 
-      const delToken =
-        grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
-          client,
-          client.identitiesTokenDelete,
-        );
+      const delToken = grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
+        client,
+        client.identitiesTokenDelete,
+      );
       const providerId = 'test-provider' as ProviderId;
       const identityId = 'test-user' as IdentityId;
       const tokenData = {
@@ -1544,11 +1527,10 @@ describe('Client service', () => {
       expect(tokenData__.getToken()).toBe('');
     });
     test('should list providers.', async () => {
-      const providersGet =
-        grpcUtils.promisifyUnaryCall<identitiesPB.Provider>(
-          client,
-          client.identitiesProvidersList,
-        );
+      const providersGet = grpcUtils.promisifyUnaryCall<identitiesPB.Provider>(
+        client,
+        client.identitiesProvidersList,
+      );
 
       const emptyMessage = new utilsPB.EmptyMessage();
       const test = await providersGet(emptyMessage, callCredentials);
@@ -1697,11 +1679,10 @@ describe('Client service', () => {
       });
     });
     test('should get gestalt from Node.', async () => {
-      const gestaltsGetNode =
-        grpcUtils.promisifyUnaryCall<gestaltsPB.Graph>(
-          client,
-          client.gestaltsGestaltGetByNode,
-        );
+      const gestaltsGetNode = grpcUtils.promisifyUnaryCall<gestaltsPB.Graph>(
+        client,
+        client.gestaltsGestaltGetByNode,
+      );
       await createGestaltState();
 
       const nodeMessage = new nodesPB.Node();
@@ -1995,11 +1976,10 @@ describe('Client service', () => {
       await testKeynodeUtils.cleanupRemoteKeynode(server2);
     });
     test('should add a node', async () => {
-      const nodesAdd =
-        grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
-          client,
-          client.nodesAdd,
-        );
+      const nodesAdd = grpcUtils.promisifyUnaryCall<utilsPB.EmptyMessage>(
+        client,
+        client.nodesAdd,
+      );
       const nodeId = nodeId2;
       const host = '127.0.0.1';
       const port = 11111;
@@ -2025,11 +2005,10 @@ describe('Client service', () => {
         await server2.stop();
 
         // Case 1: cannot establish new connection, so offline
-        const nodesPing =
-          grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
-            client,
-            client.nodesPing,
-          );
+        const nodesPing = grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
+          client,
+          client.nodesPing,
+        );
         const nodeMessage = new nodesPB.Node();
         nodeMessage.setNodeId(serverNodeId);
         const res1 = await nodesPing(nodeMessage, callCredentials);
@@ -2051,11 +2030,10 @@ describe('Client service', () => {
       global.failedConnectionTimeout * 2,
     ); // Ping needs to timeout, so longer test timeout required
     test('should find a node (local)', async () => {
-      const nodesFind =
-        grpcUtils.promisifyUnaryCall<nodesPB.NodeAddress>(
-          client,
-          client.nodesFind,
-        );
+      const nodesFind = grpcUtils.promisifyUnaryCall<nodesPB.NodeAddress>(
+        client,
+        client.nodesFind,
+      );
       // Case 1: node already exists in the local node graph (no contact required)
       const nodeId = nodeId3;
       const nodeAddress: NodeAddress = {
@@ -2084,11 +2062,10 @@ describe('Client service', () => {
         };
         // Setting the information on a remote node.
         await server.nodes.setNode(nodeId, nodeAddress);
-        const nodesFind =
-          grpcUtils.promisifyUnaryCall<nodesPB.NodeAddress>(
-            client,
-            client.nodesFind,
-          );
+        const nodesFind = grpcUtils.promisifyUnaryCall<nodesPB.NodeAddress>(
+          client,
+          client.nodesFind,
+        );
         const nodeMessage = new nodesPB.Node();
         nodeMessage.setNodeId(nodeId);
         const res = await nodesFind(nodeMessage, callCredentials);
@@ -2167,11 +2144,10 @@ describe('Client service', () => {
     });
     test('should send a gestalt invite (no existing invitation)', async () => {
       // Node Claim Case 1: No invitations have been received
-      const nodesClaim =
-        grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
-          client,
-          client.nodesClaim,
-        );
+      const nodesClaim = grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
+        client,
+        client.nodesClaim,
+      );
       const nodeClaimMessage = new nodesPB.Claim();
       nodeClaimMessage.setNodeId(remoteGestalt.nodes.getNodeId());
       nodeClaimMessage.setForceInvite(false);
@@ -2187,11 +2163,10 @@ describe('Client service', () => {
           type: 'GestaltInvite',
         },
       );
-      const nodesClaim =
-        grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
-          client,
-          client.nodesClaim,
-        );
+      const nodesClaim = grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
+        client,
+        client.nodesClaim,
+      );
       const nodeClaimMessage = new nodesPB.Claim();
       nodeClaimMessage.setNodeId(remoteGestalt.nodes.getNodeId());
       nodeClaimMessage.setForceInvite(true);
@@ -2207,11 +2182,10 @@ describe('Client service', () => {
           type: 'GestaltInvite',
         },
       );
-      const nodesClaim =
-        grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
-          client,
-          client.nodesClaim,
-        );
+      const nodesClaim = grpcUtils.promisifyUnaryCall<utilsPB.StatusMessage>(
+        client,
+        client.nodesClaim,
+      );
       const nodeClaimMessage = new nodesPB.Claim();
       nodeClaimMessage.setNodeId(remoteGestalt.nodes.getNodeId());
       nodeClaimMessage.setForceInvite(false);
diff --git a/tests/grpc/utils.ts b/tests/grpc/utils.ts
index a2ed442257..f6bf2c3823 100644
--- a/tests/grpc/utils.ts
+++ b/tests/grpc/utils.ts
@@ -6,8 +6,12 @@ import Logger from '@matrixai/logger';
 import * as grpc from '@grpc/grpc-js';
 import { GRPCClient, utils as grpcUtils, errors as grpcErrors } from '@/grpc';
 import { promisify } from '@/utils';
-import { TestServiceService, ITestServiceServer, TestServiceClient } from '@/proto/js/polykey/v1/test_service_grpc_pb';
-import * as utilsPB from '@/proto/js/polykey/v1/utils/utils_pb'
+import {
+  TestServiceService,
+  ITestServiceServer,
+  TestServiceClient,
+} from '@/proto/js/polykey/v1/test_service_grpc_pb';
+import * as utilsPB from '@/proto/js/polykey/v1/utils/utils_pb';
 
 /**
  * Test GRPC service
diff --git a/tests/network/index.test.ts b/tests/network/index.test.ts
index 3a31f1e376..489dea1735 100644
--- a/tests/network/index.test.ts
+++ b/tests/network/index.test.ts
@@ -3,7 +3,7 @@ import type { Host, Port } from '@/network/types';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as keysUtils } from '@/keys';
 import { ForwardProxy, ReverseProxy, utils as networkUtils } from '@/network';
-import * as testPB from '@/proto/js/test_pb';
+import * as utilsPB from '@/proto/js/polykey/v1/utils/utils_pb';
 import { openTestServer, closeTestServer, GRPCClientTest } from '../grpc/utils';
 
 describe('network index', () => {
@@ -71,7 +71,7 @@ describe('network index', () => {
       logger,
     });
     await client.start();
-    const m = new testPB.EchoMessage();
+    const m = new utilsPB.EchoMessage();
     const challenge = 'Hello!';
     m.setChallenge(challenge);
     // Unary call