diff --git a/src/prism-agent/Agent.ts b/src/prism-agent/Agent.ts
index f53efb386..093899f6e 100644
--- a/src/prism-agent/Agent.ts
+++ b/src/prism-agent/Agent.ts
@@ -196,10 +196,10 @@ export default class Agent
    * @returns {Agent}
    */
   static instanceFromConnectionManager(
-    apollo: Apollo,
-    castor: Castor,
+    apollo: Domain.Apollo,
+    castor: Domain.Castor,
     pluto: Domain.Pluto,
-    mercury: Mercury,
+    mercury: Domain.Mercury,
     connectionManager: ConnectionsManager,
     seed?: Domain.Seed,
     api?: Domain.Api
diff --git a/tests/agent/Agent.test.ts b/tests/agent/Agent.test.ts
index f990ca574..13d250e18 100644
--- a/tests/agent/Agent.test.ts
+++ b/tests/agent/Agent.test.ts
@@ -18,7 +18,6 @@ import {
   Api,
   Credential,
   CredentialType,
-  DefaultLinkSecretName,
   DID,
   HttpResponse,
   Message,
diff --git a/tests/agent/mocks/CastorMock.ts b/tests/agent/mocks/CastorMock.ts
index 4221d6099..7adf32392 100644
--- a/tests/agent/mocks/CastorMock.ts
+++ b/tests/agent/mocks/CastorMock.ts
@@ -2,7 +2,6 @@
 import {
   DID,
   DIDDocument,
-  KeyPair,
   PublicKey,
   Service,
 } from "../../../src/domain";
@@ -30,7 +29,7 @@ export const CastorMock: Castor & typeof castorVars = {
     return Promise.resolve(castorVars._prismDID)
   },
 
-  createPeerDID(keyPairs: KeyPair[], services: Service[]): Promise<DID> {
+  createPeerDID(publicKeys: PublicKey[], services: Service[]): Promise<DID> {
     return Promise.resolve(castorVars._peerDID);
   },
 
@@ -44,7 +43,7 @@ export const CastorMock: Castor & typeof castorVars = {
   ): Promise<boolean> {
     throw new Error("Method not implemented.");
   },
-  getEcnumbasis(did: DID, keyPair: KeyPair): string {
+  getEcnumbasis(did: DID, publicKey: PublicKey): string {
     throw new Error("Method not implemented.");
   },
 };
diff --git a/tests/agent/mocks/ConnectionManagerMock.ts b/tests/agent/mocks/ConnectionManagerMock.ts
index d88d0b6cc..cced7bf83 100644
--- a/tests/agent/mocks/ConnectionManagerMock.ts
+++ b/tests/agent/mocks/ConnectionManagerMock.ts
@@ -2,9 +2,9 @@ import {
   ConnectionsManager as ConnectionsManagerClass,
   MediatorHandler,
 } from "../../../src/prism-agent/types";
-import Castor from "../../../src/domain/buildingBlocks/Castor";
-import Mercury from "../../../src/domain/buildingBlocks/Mercury";
-import Pluto from "../../../src/domain/buildingBlocks/Pluto";
+import { Castor } from "../../../src/domain/buildingBlocks/Castor";
+import { Mercury } from "../../../src/domain/buildingBlocks/Mercury";
+import { Pluto } from "../../../src/domain/buildingBlocks/Pluto";
 import { DIDPair } from "../../../src/domain/models/DIDPair";
 import { CancellableTask } from "../../../src/prism-agent/helpers/Task";
 import { DID, Message } from "../../../src/domain";
@@ -16,7 +16,7 @@ export class ConnectionsManagerMock implements ConnectionsManagerClass {
   mercury: Mercury;
   pluto: Pluto;
   mediationHandler: MediatorHandler = {
-    updateKeyListWithDIDs: () => {},
+    updateKeyListWithDIDs: () => { },
     mediator: {
       mediatorDID: new DID(
         "did",
diff --git a/tests/agent/mocks/MercuryMock.ts b/tests/agent/mocks/MercuryMock.ts
index 479666ac9..9bb80b28d 100644
--- a/tests/agent/mocks/MercuryMock.ts
+++ b/tests/agent/mocks/MercuryMock.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { base64 } from "multiformats/bases/base64";
 import { Message } from "../../../src/domain";
-import Mercury from "../../../src/domain/buildingBlocks/Mercury";
+import { Mercury } from "../../../src/domain/buildingBlocks/Mercury";
 
 export class MercuryStub implements Mercury {
   private throwSendMessageError?: Error;
diff --git a/tests/agent/protocols/invitation/v2/DIDCommInvitationRunner.test.ts b/tests/agent/protocols/invitation/v2/DIDCommInvitationRunner.test.ts
index f28d962b5..54c5ef8df 100644
--- a/tests/agent/protocols/invitation/v2/DIDCommInvitationRunner.test.ts
+++ b/tests/agent/protocols/invitation/v2/DIDCommInvitationRunner.test.ts
@@ -2,7 +2,7 @@ import chai from "chai";
 import { expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 import { Message } from "../../../../../src/domain";
-import Mercury from "../../../../../src/domain/buildingBlocks/Mercury";
+import { Mercury } from "../../../../../src/domain/buildingBlocks/Mercury";
 import { AgentError } from "../../../../../src/domain/models/Errors";
 import { DIDCommInvitationRunner } from "../../../../../src/prism-agent/protocols/invitation/v2/DIDCommInvitationRunner";
 import { MercuryStub } from "../../../mocks/MercuryMock";
diff --git a/tests/agent/protocols/pickup/PickupRunner.test.ts b/tests/agent/protocols/pickup/PickupRunner.test.ts
index 2c7b754e7..362383bc0 100644
--- a/tests/agent/protocols/pickup/PickupRunner.test.ts
+++ b/tests/agent/protocols/pickup/PickupRunner.test.ts
@@ -4,7 +4,7 @@ import chaiAsPromised from "chai-as-promised";
 
 import { expect } from "chai";
 
-import Mercury from "../../../../src/domain/buildingBlocks/Mercury";
+import { Mercury } from "../../../../src/domain/buildingBlocks/Mercury";
 import { MercuryStub } from "../../mocks/MercuryMock";
 import {
   AttachmentData,