diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/dao/repository/WalletKeyRepository.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/dao/repository/WalletKeyRepository.java
index 11d6ece1e..199f29121 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/dao/repository/WalletKeyRepository.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/dao/repository/WalletKeyRepository.java
@@ -31,13 +31,21 @@
 @Repository
 public interface WalletKeyRepository extends BaseRepository<WalletKey, Long> {
     /**
-     * Gets by wallet id.
+     * Gets by wallet id and algorithm.
      *
      * @param id the id
+     * param algorithm the algorithm
      * @return the by wallet id
      */
     WalletKey getByWalletIdAndAlgorithm(Long id, String algorithm);
 
+    /**
+     * Gets by wallet id.
+     * @param id
+     * @return WalletKey
+     */
+    WalletKey getByWalletId(Long id);
+
     WalletKey findFirstByWallet_Bpn(String bpn);
 
     WalletKey findFirstByWallet_Did(String did);
diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/HoldersCredentialService.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/HoldersCredentialService.java
index af31c3e62..b78b2f18e 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/HoldersCredentialService.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/HoldersCredentialService.java
@@ -160,7 +160,7 @@ public CredentialsResponse issueCredential(Map<String, Object> data, boolean asJ
         Validate.isFalse(callerBpn.equals(issuerWallet.getBpn())).launch(new ForbiddenException(BASE_WALLET_BPN_IS_NOT_MATCHING_WITH_REQUEST_BPN_FROM_TOKEN));
 
         // get Key
-        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdentifierAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
+        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
 
         // check if the expiryDate is set
         Date expiryDate = null;
diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialService.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialService.java
index 40193247e..dde4f231e 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialService.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialService.java
@@ -190,7 +190,7 @@ public PageImpl<CredentialsResponse> getCredentials(GetCredentialsCommand comman
      */
     @Transactional(isolation = Isolation.READ_UNCOMMITTED, propagation = Propagation.REQUIRED)
     public VerifiableCredential issueBpnCredential(Wallet baseWallet, Wallet holderWallet, boolean authority) {
-        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdentifierAsBytes(baseWallet.getId(), baseWallet.getAlgorithm());
+        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdAsBytes(baseWallet.getId(), baseWallet.getAlgorithm());
         List<String> types = List.of(VerifiableCredentialType.VERIFIABLE_CREDENTIAL, MIWVerifiableCredentialType.BPN_CREDENTIAL);
         VerifiableCredentialSubject verifiableCredentialSubject = new VerifiableCredentialSubject(Map.of(StringPool.TYPE, MIWVerifiableCredentialType.BPN_CREDENTIAL,
                 StringPool.ID, holderWallet.getDid(),
@@ -233,7 +233,7 @@ public CredentialsResponse issueFrameworkCredential(IssueFrameworkCredentialRequ
 
         validateAccess(callerBPN, baseWallet);
         // get Key
-        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdentifierAsBytes(baseWallet.getId(), baseWallet.getAlgorithm());
+        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdAsBytes(baseWallet.getId(), baseWallet.getAlgorithm());
 
         //if base wallet issue credentials to itself
         boolean isSelfIssued = isSelfIssued(holderWallet.getBpn());
@@ -293,7 +293,7 @@ public CredentialsResponse issueDismantlerCredential(IssueDismantlerCredentialRe
         //check duplicate
         isCredentialExit(holderWallet.getDid(), MIWVerifiableCredentialType.DISMANTLER_CREDENTIAL);
 
-        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdentifierAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
+        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
 
         //if base wallet issue credentials to itself
         boolean isSelfIssued = isSelfIssued(request.getBpn());
@@ -352,7 +352,7 @@ public CredentialsResponse issueMembershipCredential(IssueMembershipCredentialRe
 
         validateAccess(callerBPN, issuerWallet);
 
-        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdentifierAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
+        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
         List<String> types = List.of(VerifiableCredentialType.VERIFIABLE_CREDENTIAL, VerifiableCredentialType.MEMBERSHIP_CREDENTIAL);
 
         //if base wallet issue credentials to itself
@@ -417,7 +417,7 @@ public CredentialsResponse issueCredentialUsingBaseWallet(String holderDid, Map<
         validateAccess(callerBpn, issuerWallet);
 
         // get issuer Key
-        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdentifierAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
+        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdAsBytes(issuerWallet.getId(), issuerWallet.getAlgorithm());
 
         boolean isSelfIssued = isSelfIssued(holderWallet.getBpn());
 
diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/PresentationService.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/PresentationService.java
index 70b57fac8..6f66ec5bd 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/PresentationService.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/PresentationService.java
@@ -146,9 +146,8 @@ public Map<String, Object> createPresentation(Map<String, Object> data, boolean
         return buildVP(asJwt, audience, callerBpn, callerWallet, verifiableCredentials, SupportedAlgorithms.ED25519);
     }
 
-    @SneakyThrows({ InvalidePrivateKeyFormat.class })
     private Map<String, Object> buildVP(boolean asJwt, String audience, String callerBpn, Wallet callerWallet,
-                                        List<VerifiableCredential> verifiableCredentials, SupportedAlgorithms algorithm) {
+                                        List<VerifiableCredential> verifiableCredentials, SupportedAlgorithms algorithm){
         Map<String, Object> response = new HashMap<>();
         if (asJwt && algorithm.equals(SupportedAlgorithms.ES256K)) {
             buildVPJwtES256K(audience, callerBpn, callerWallet, verifiableCredentials, algorithm, response);
@@ -174,15 +173,16 @@ private void buildVPJsonLd(String callerBpn, List<VerifiableCredential> verifiab
         response.put(StringPool.VP, verifiablePresentation);
     }
 
-    private void buildVPJwtEdDSA(String audience, String callerBpn, Wallet callerWallet, List<VerifiableCredential> verifiableCredentials, SupportedAlgorithms algorithm, Map<String, Object> response) throws InvalidePrivateKeyFormat {
+    @SneakyThrows({ InvalidPrivateKeyFormatException.class})
+    private void buildVPJwtEdDSA(String audience, String callerBpn, Wallet callerWallet, List<VerifiableCredential> verifiableCredentials, SupportedAlgorithms algorithm, Map<String, Object> response) {
         Pair<Did, Object> result = getPrivateKey(callerWallet, algorithm, audience, callerBpn);
 
         SerializedJwtPresentationFactory presentationFactory = new SerializedJwtPresentationFactoryImpl(
                 new SignedJwtFactory(new OctetKeyPairFactory()), new JsonLdSerializerImpl(), result.getKey());
 
-        x21559PrivateKey ed25519Key = (x21559PrivateKey) result.getRight();
-        x21559PrivateKey privateKey = new x21559PrivateKey(ed25519Key.asByte());
-        SignedJWT presentation = presentationFactory.createPresentation(result.getLeft(), verifiableCredentials, audience, privateKey);
+        x25519PrivateKey ed25519Key = (x25519PrivateKey) result.getRight();
+        x25519PrivateKey privateKey = new x25519PrivateKey(ed25519Key.asByte());
+        SignedJWT presentation = presentationFactory.createPresentation(result.getLeft(), verifiableCredentials, audience, privateKey , "keyId" );
 
         response.put(StringPool.VP, presentation.serialize());
     }
@@ -197,6 +197,7 @@ private void buildVPJwtES256K(String audience, String callerBpn, Wallet callerWa
         response.put(StringPool.VP, presentation.serialize());
     }
 
+    @SneakyThrows({ DidParseException.class })
     private Pair<Did, Object> getPrivateKey(Wallet callerWallet, SupportedAlgorithms algorithm, String audience, String callerBpn) {
         log.debug("Creating VP as JWT for bpn ->{}", callerBpn);
         Validate.isFalse(StringUtils.hasText(audience)).launch(new BadDataException("Audience needed to create VP as JWT"));
@@ -205,7 +206,7 @@ private Pair<Did, Object> getPrivateKey(Wallet callerWallet, SupportedAlgorithms
         Did vpIssuerDid = DidParser.parse(callerWallet.getDid());
 
         //Build JWT
-        return Pair.of(vpIssuerDid, walletKeyService.getPrivateKeyByWalletIdentifierAndAlgorithm(callerWallet.getId(), algorithm));
+        return Pair.of(vpIssuerDid, walletKeyService.getPrivateKeyByWalletIdAndAlgorithm(callerWallet.getId(), algorithm));
     }
 
 
diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletKeyService.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletKeyService.java
index 6883fb2de..0453a0c6f 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletKeyService.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletKeyService.java
@@ -69,13 +69,14 @@ protected SpecificationUtil<WalletKey> getSpecificationUtil() {
      * Get private key by wallet identifier as bytes byte [ ].
      *
      * @param walletId the wallet id
+     * @param algorithm the algorithm
      * @return the byte [ ]
      */
     @SneakyThrows
-    public byte[] getPrivateKeyByWalletIdentifierAsBytes(long walletId, String algorithm) {
-        Object privateKey = getPrivateKeyByWalletIdentifierAndAlgorithm(walletId, SupportedAlgorithms.valueOf(algorithm));
-        if (privateKey instanceof x21559PrivateKey x21559PrivateKey) {
-            return x21559PrivateKey.asByte();
+    public byte[] getPrivateKeyByWalletIdAsBytes(long walletId, String algorithm) {
+        Object privateKey = getPrivateKeyByWalletIdAndAlgorithm(walletId, SupportedAlgorithms.valueOf(algorithm));
+        if (privateKey instanceof x25519PrivateKey x25519PrivateKey) {
+            return x25519PrivateKey.asByte();
         } else {
             return ((ECPrivateKey) privateKey).getEncoded();
         }
@@ -85,16 +86,16 @@ public byte[] getPrivateKeyByWalletIdentifierAsBytes(long walletId, String algor
      * Gets private key by wallet identifier.
      *
      * @param walletId the wallet id
+     * @param algorithm the algorithm
      * @return the private key by wallet identifier
      */
     @SneakyThrows
-
-    public Object getPrivateKeyByWalletIdentifierAndAlgorithm(long walletId, SupportedAlgorithms algorithm) {
+    public Object getPrivateKeyByWalletIdAndAlgorithm(long walletId, SupportedAlgorithms algorithm) {
         WalletKey wallet = walletKeyRepository.getByWalletIdAndAlgorithm(walletId, algorithm.toString());
         String privateKey = encryptionUtils.decrypt(wallet.getPrivateKey());
         byte[] content = new PemReader(new StringReader(privateKey)).readPemObject().getContent();
         if (SupportedAlgorithms.ED25519.equals(algorithm)) {
-            return new x21559PrivateKey(content);
+            return new x25519PrivateKey(content);
         } else if (SupportedAlgorithms.ES256K.equals(algorithm)) {
             KeyFactory kf = KeyFactory.getInstance(EC);
             return kf.generatePrivate(new PKCS8EncodedKeySpec(content));
@@ -103,4 +104,16 @@ public Object getPrivateKeyByWalletIdentifierAndAlgorithm(long walletId, Support
         }
     }
 
+       /**
+     * Gets wallet key by wallet identifier.
+     *
+     * @param walletId the wallet id
+     * @return the wallet key by wallet identifier
+     */
+    @SneakyThrows
+    public String getWalletKeyIdByWalletId(long walletId) {
+        return walletKeyRepository.getByWalletId(walletId).getKeyId();
+    }
+
+
 }
diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/utils/CommonUtils.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/utils/CommonUtils.java
index 8dc13570f..360f2ae7b 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/utils/CommonUtils.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/utils/CommonUtils.java
@@ -27,6 +27,7 @@
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemWriter;
 import org.eclipse.tractusx.managedidentitywallets.constant.StringPool;
+import org.eclipse.tractusx.managedidentitywallets.constant.SupportedAlgorithms;
 import org.eclipse.tractusx.managedidentitywallets.dao.entity.HoldersCredential;
 import org.eclipse.tractusx.managedidentitywallets.dto.SecureTokenRequest;
 import org.eclipse.tractusx.managedidentitywallets.dao.entity.Wallet;
@@ -35,6 +36,7 @@
 import org.eclipse.tractusx.managedidentitywallets.service.WalletKeyService;
 import org.eclipse.tractusx.ssi.lib.crypt.octet.OctetKeyPairFactory;
 import org.eclipse.tractusx.ssi.lib.crypt.x25519.x25519PrivateKey;
+import org.eclipse.tractusx.ssi.lib.exception.did.DidParseException;
 import org.eclipse.tractusx.ssi.lib.exception.json.TransformJsonLdException;
 import org.eclipse.tractusx.ssi.lib.exception.key.InvalidPrivateKeyFormatException;
 import org.eclipse.tractusx.ssi.lib.exception.proof.SignatureGenerateFailedException;
@@ -182,7 +184,8 @@ public static SecureTokenRequest getSecureTokenRequest(MultiValueMap<String, Str
         return objectMapper.convertValue(singleValueMap, SecureTokenRequest.class);
     }
     
-    public static String vcAsJwt(Wallet issuerWallet, Wallet holderWallet, VerifiableCredential vc , WalletKeyService walletKeyService) {
+    @SneakyThrows({DidParseException.class})
+    public static String vcAsJwt(Wallet issuerWallet, Wallet holderWallet, VerifiableCredential vc , WalletKeyService walletKeyService){
 
         Did issuerDid = DidParser.parse(issuerWallet.getDid());
         Did holderDid = DidParser.parse(holderWallet.getDid());
@@ -191,13 +194,14 @@ public static String vcAsJwt(Wallet issuerWallet, Wallet holderWallet, Verifiabl
         SerializedJwtVCFactoryImpl vcFactory = new SerializedJwtVCFactoryImpl(
                 new SignedJwtFactory(new OctetKeyPairFactory()));
 
-        x25519PrivateKey privateKey = walletKeyService.getPrivateKeyByWalletId(issuerWallet.getId());
+        x25519PrivateKey privateKey = (x25519PrivateKey) walletKeyService.getPrivateKeyByWalletIdAndAlgorithm(issuerWallet.getId(), SupportedAlgorithms.ED25519);
         // JWT Factory
 
         SignedJWT vcJWT = vcFactory.createVCJwt(issuerDid, holderDid, vc,
                 privateKey,
-                walletKeyService.getWalletKeyIdByWalletId(issuerWallet.getId()));
-
+                walletKeyService.getWalletKeyIdByWalletId(issuerWallet.getId())
+                
+                );
         return vcJWT.serialize();
     }
 
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialServiceTest.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialServiceTest.java
index 5863616e7..623fb8c10 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialServiceTest.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/service/IssuersCredentialServiceTest.java
@@ -32,6 +32,7 @@
 import org.eclipse.tractusx.managedidentitywallets.config.MIWSettings;
 import org.eclipse.tractusx.managedidentitywallets.constant.MIWVerifiableCredentialType;
 import org.eclipse.tractusx.managedidentitywallets.constant.StringPool;
+import org.eclipse.tractusx.managedidentitywallets.constant.SupportedAlgorithms;
 import org.eclipse.tractusx.managedidentitywallets.dao.entity.HoldersCredential;
 import org.eclipse.tractusx.managedidentitywallets.dao.entity.IssuersCredential;
 import org.eclipse.tractusx.managedidentitywallets.dao.entity.Wallet;
@@ -175,7 +176,7 @@ void shouldIssueCredentialAsJwt()
             when(walletKey.getKeyId()).thenReturn(KEY_ID);
             when(walletKey.getId()).thenReturn(42L);
 
-            when(walletKeyService.getPrivateKeyByWalletId(baseWallet.getId()))
+            when(walletKeyService.getPrivateKeyByWalletIdAndAlgorithm(baseWallet.getId() ,SupportedAlgorithms.valueOf(baseWallet.getAlgorithm())))
                     .thenReturn(new x25519PrivateKey(keyPair.getPrivateKey().asStringForStoring(), true));
             when(walletKeyService.getWalletKeyIdByWalletId(baseWallet.getId())).thenReturn(walletKeyId);
 
@@ -225,7 +226,7 @@ void shouldIssueCredentialAsJwt()
             when(walletKey.getKeyId()).thenReturn(KEY_ID);
             when(walletKey.getId()).thenReturn(42L);
 
-            when(walletKeyService.getPrivateKeyByWalletId(baseWallet.getId()))
+            when(walletKeyService.getPrivateKeyByWalletIdAndAlgorithm(baseWallet.getId() ,SupportedAlgorithms.valueOf(baseWallet.getAlgorithm())))
                     .thenReturn(new x25519PrivateKey(keyPair.getPrivateKey().asStringForStoring(), true));
             when(walletKeyService.getWalletKeyIdByWalletId(baseWallet.getId())).thenReturn(walletKeyId);
 
@@ -264,7 +265,7 @@ void shouldIssueCredentialAsJwt() throws IOException, InvalidPrivateKeyFormatExc
             when(walletKey.getKeyId()).thenReturn(KEY_ID);
             when(walletKey.getId()).thenReturn(42L);
 
-            when(walletKeyService.getPrivateKeyByWalletId(baseWallet.getId()))
+            when(walletKeyService.getPrivateKeyByWalletIdAndAlgorithm(baseWallet.getId() ,SupportedAlgorithms.valueOf(baseWallet.getAlgorithm())))
                     .thenReturn(new x25519PrivateKey(keyPair.getPrivateKey().asStringForStoring(), true));
             when(walletKeyService.getWalletKeyIdByWalletId(baseWallet.getId())).thenReturn(walletKeyId);
 
@@ -298,7 +299,7 @@ void shouldIssueCredentialAsJwt() throws IOException, ParseException, InvalidPri
                     MockUtil.generateDid("basewallet")).build();
 
             MockUtil.makeCreateWorkForIssuer(issuersCredentialRepository);
-            when(walletKeyService.getPrivateKeyByWalletIdAsBytes(any(Long.class))).thenReturn(keyPair.getPrivateKey()
+            when(walletKeyService.getPrivateKeyByWalletIdAsBytes(any(Long.class) , SupportedAlgorithms.ED25519.toString())).thenReturn(keyPair.getPrivateKey()
                     .asByte());
             when(commonService.getWalletByIdentifier(holderWalletBpn)).thenReturn(holderWallet);
             when(commonService.getWalletByIdentifier(verifiableCredential.getIssuer()
@@ -317,7 +318,7 @@ public HoldersCredential answer(InvocationOnMock invocation) throws Throwable {
             WalletKey walletKey = mock(WalletKey.class);
             when(walletKey.getKeyId()).thenReturn(KEY_ID);
             when(walletKey.getId()).thenReturn(42L);
-            when(walletKeyService.getPrivateKeyByWalletId(baseWallet.getId()))
+            when(walletKeyService.getPrivateKeyByWalletIdAndAlgorithm(baseWallet.getId() ,SupportedAlgorithms.valueOf(baseWallet.getAlgorithm())))
                     .thenReturn(new x25519PrivateKey(keyPair.getPrivateKey().asStringForStoring(), true));
             when(walletKeyService.getWalletKeyIdByWalletId(baseWallet.getId())).thenReturn(walletKeyId);
 
@@ -431,7 +432,7 @@ private void mockCommon(
         when(miwSettings.authorityWalletBpn()).thenReturn(baseWalletBpn);
         when(commonService.getWalletByIdentifier(baseWalletBpn)).thenReturn(baseWallet);
         when(commonService.getWalletByIdentifier(holderWalletBpn)).thenReturn(holderWallet);
-        when(walletKeyService.getPrivateKeyByWalletIdAsBytes(baseWallet.getId()))
+        when(walletKeyService.getPrivateKeyByWalletIdAsBytes(baseWallet.getId() ,baseWallet.getAlgorithm()))
                 .thenReturn(keyPair.getPrivateKey().asByte());
         when(miwSettings.supportedFrameworkVCTypes()).thenReturn(Set.of("SustainabilityCredential"));
         when(holdersCredentialRepository.save(any(HoldersCredential.class)))
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/utils/TestUtils.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/utils/TestUtils.java
index 46774f420..82bb85f6d 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/utils/TestUtils.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/utils/TestUtils.java
@@ -50,6 +50,7 @@
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredentialSubject;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.springframework.boot.test.web.client.TestRestTemplate;
@@ -144,7 +145,7 @@ public static IssueFrameworkCredentialRequest getIssueFrameworkCredentialRequest
     }
 
 
-    public static Wallet getWalletFromString(String body) throws JsonProcessingException {
+    public static Wallet getWalletFromString(String body) throws JsonProcessingException, JSONException {
         JSONObject jsonObject = new JSONObject(body);
         //convert DidDocument
         JSONObject didDocument = jsonObject.getJSONObject(StringPool.DID_DOCUMENT);
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/FrameworkHoldersCredentialTest.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/FrameworkHoldersCredentialTest.java
index e9710dab5..ebcec77bf 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/FrameworkHoldersCredentialTest.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/FrameworkHoldersCredentialTest.java
@@ -191,7 +191,7 @@ void issueFrameworkCredentialTest400() throws JsonProcessingException, JSONExcep
 
     }
 
-    private void createAndValidateVC(String bpn, String did, String type) throws JsonProcessingException {
+    private void createAndValidateVC(String bpn, String did, String type) throws JsonProcessingException, JSONException {
         //create wallet
         String baseBpn = miwSettings.authorityWalletBpn();
         String defaultLocation = miwSettings.host() + COLON_SEPARATOR + bpn;
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/HoldersCredentialTest.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/HoldersCredentialTest.java
index 02a1d8aeb..fb0f69a6a 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/HoldersCredentialTest.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/HoldersCredentialTest.java
@@ -40,6 +40,13 @@
 import org.eclipse.tractusx.managedidentitywallets.utils.TestUtils;
 import org.eclipse.tractusx.ssi.lib.did.resolver.DidResolver;
 import org.eclipse.tractusx.ssi.lib.did.web.DidWebFactory;
+import org.eclipse.tractusx.ssi.lib.exception.did.DidParseException;
+import org.eclipse.tractusx.ssi.lib.exception.json.TransformJsonLdException;
+import org.eclipse.tractusx.ssi.lib.exception.key.InvalidPublicKeyFormatException;
+import org.eclipse.tractusx.ssi.lib.exception.proof.NoVerificationKeyFoundException;
+import org.eclipse.tractusx.ssi.lib.exception.proof.SignatureParseException;
+import org.eclipse.tractusx.ssi.lib.exception.proof.SignatureVerificationFailedException;
+import org.eclipse.tractusx.ssi.lib.exception.proof.UnsupportedSignatureTypeException;
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredential;
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredentialBuilder;
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredentialSubject;
@@ -258,7 +265,7 @@ void getCredentialsAsJWT200() throws com.fasterxml.jackson.core.JsonProcessingEx
 
 
     @Test
-    void validateCredentialsWithInvalidVC() throws com.fasterxml.jackson.core.JsonProcessingException {
+    void validateCredentialsWithInvalidVC() throws com.fasterxml.jackson.core.JsonProcessingException, UnsupportedSignatureTypeException, InvalidPublicKeyFormatException, NoVerificationKeyFoundException, SignatureParseException, DidParseException, SignatureVerificationFailedException, TransformJsonLdException {
         //data setup
         CredentialVerificationRequest request = new CredentialVerificationRequest();
         request.setVc(issueVC());
@@ -281,7 +288,7 @@ void validateCredentialsWithInvalidVC() throws com.fasterxml.jackson.core.JsonPr
 
     @Test
     @DisplayName("validate VC with date check true, it should return true")
-    void validateCredentialsWithExpiryCheckTrue() throws com.fasterxml.jackson.core.JsonProcessingException {
+    void validateCredentialsWithExpiryCheckTrue() throws com.fasterxml.jackson.core.JsonProcessingException, UnsupportedSignatureTypeException, InvalidPublicKeyFormatException, NoVerificationKeyFoundException, SignatureParseException, DidParseException, SignatureVerificationFailedException, TransformJsonLdException {
         CredentialVerificationRequest request = new CredentialVerificationRequest();
         request.setVc(issueVC());
 
@@ -303,7 +310,7 @@ void validateCredentialsWithExpiryCheckTrue() throws com.fasterxml.jackson.core.
 
     @Test
     @DisplayName("validate expired VC with date check false, it should return true")
-    void validateCredentialsWithExpiryCheckFalse() throws com.fasterxml.jackson.core.JsonProcessingException {
+    void validateCredentialsWithExpiryCheckFalse() throws com.fasterxml.jackson.core.JsonProcessingException, UnsupportedSignatureTypeException, InvalidPublicKeyFormatException, NoVerificationKeyFoundException, SignatureParseException, DidParseException, SignatureVerificationFailedException, TransformJsonLdException {
         CredentialVerificationRequest request = new CredentialVerificationRequest();
         request.setVc(issueVC());
 
@@ -330,7 +337,7 @@ void validateCredentialsWithExpiryCheckFalse() throws com.fasterxml.jackson.core
 
     @Test
     @DisplayName("validate expired VC with date check true, it should return false")
-    void validateExpiredCredentialsWithExpiryCheckTrue() throws com.fasterxml.jackson.core.JsonProcessingException {
+    void validateExpiredCredentialsWithExpiryCheckTrue() throws com.fasterxml.jackson.core.JsonProcessingException, UnsupportedSignatureTypeException, InvalidPublicKeyFormatException, NoVerificationKeyFoundException, SignatureParseException, DidParseException, SignatureVerificationFailedException, TransformJsonLdException {
 
         //data setup
         CredentialVerificationRequest request = new CredentialVerificationRequest();
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/MembershipHoldersCredentialTest.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/MembershipHoldersCredentialTest.java
index bdf072746..e640c8116 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/MembershipHoldersCredentialTest.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/MembershipHoldersCredentialTest.java
@@ -98,7 +98,7 @@ void issueMembershipCredentialTest403() {
     }
 
     @Test
-    void testIssueSummeryVCAfterDeleteSummaryVCFromHolderWallet() throws JsonProcessingException {
+    void testIssueSummeryVCAfterDeleteSummaryVCFromHolderWallet() throws JsonProcessingException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String did = DidWebFactory.fromHostnameAndPath(miwSettings.host(), bpn).toString();
         String baseBpn = miwSettings.authorityWalletBpn();
@@ -128,7 +128,7 @@ void testIssueSummeryVCAfterDeleteSummaryVCFromHolderWallet() throws JsonProcess
     }
 
     @Test
-    void testStoredSummaryVCTest() throws JsonProcessingException {
+    void testStoredSummaryVCTest() throws JsonProcessingException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String did = DidWebFactory.fromHostnameAndPath(miwSettings.host(), bpn).toString();
         String baseBpn = miwSettings.authorityWalletBpn();
@@ -192,7 +192,7 @@ void testStoredSummaryVCTest() throws JsonProcessingException {
     }
 
     @Test
-    void issueMembershipCredentialToBaseWalletTest400() throws JsonProcessingException {
+    void issueMembershipCredentialToBaseWalletTest400() throws JsonProcessingException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String baseBpn = miwSettings.authorityWalletBpn();
 
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/VerifiableCredentialIssuerEqualProofSignerTest.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/VerifiableCredentialIssuerEqualProofSignerTest.java
index 8a5807daf..d73455648 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/VerifiableCredentialIssuerEqualProofSignerTest.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vc/VerifiableCredentialIssuerEqualProofSignerTest.java
@@ -111,7 +111,7 @@ private VerifiableCredential issueVC(String issuerDid, Wallet signerWallet) thro
         LinkedDataProofGenerator generator = LinkedDataProofGenerator.newInstance(SignatureType.JWS);
         URI verificationMethod = signerWallet.getDidDocument().getVerificationMethods().get(0).getId();
 
-        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdentifierAsBytes(signerWallet.getId(), signerWallet.getAlgorithm());
+        byte[] privateKeyBytes = walletKeyService.getPrivateKeyByWalletIdAsBytes(signerWallet.getId(), signerWallet.getAlgorithm());
 
         JWSSignature2020 proof =
                 (JWSSignature2020) generator.createProof(builder.build(), verificationMethod, new x25519PrivateKey(privateKeyBytes));
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vp/PresentationTest.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vp/PresentationTest.java
index b809dac81..d201cefc2 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/vp/PresentationTest.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/vp/PresentationTest.java
@@ -50,6 +50,7 @@
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredentialSubject;
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredentialType;
 import org.jetbrains.annotations.NotNull;
+import org.json.JSONException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedConstruction;
@@ -95,7 +96,7 @@ class PresentationTest {
 
 
     @Test
-    void validateVPAssJsonLd400() throws JsonProcessingException {
+    void validateVPAssJsonLd400() throws JsonProcessingException, JSONException {
         //create VP
         String bpn = TestUtils.getRandomBpmNumber();
         String audience = "companyA";
@@ -112,7 +113,7 @@ void validateVPAssJsonLd400() throws JsonProcessingException {
 
 
     @Test
-    void validateVPAsJwt() throws JsonProcessingException {
+    void validateVPAsJwt() throws JsonProcessingException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String audience = "companyA";
         ResponseEntity<Map> vpResponse = createBpnVCAsJwt(bpn, audience);
@@ -159,7 +160,7 @@ void validateVPAsJwtWithInvalidSignatureAndInValidAudienceAndExpiryDateValidatio
     }
 
     @Test
-    void validateVPAsJwtWithValidAudienceAndDateValidation() throws JsonProcessingException {
+    void validateVPAsJwtWithValidAudienceAndDateValidation() throws JsonProcessingException, JSONException {
         //create VP
         String bpn = TestUtils.getRandomBpmNumber();
         String audience = "companyA";
@@ -176,7 +177,7 @@ void validateVPAsJwtWithValidAudienceAndDateValidation() throws JsonProcessingEx
     }
 
     @Test
-    void validateVPAsJwtWithInValidVCDateValidation() throws JsonProcessingException {
+    void validateVPAsJwtWithInValidVCDateValidation() throws JsonProcessingException, JSONException {
         //create VP
         String bpn = TestUtils.getRandomBpmNumber();
         String audience = "companyA";
@@ -194,7 +195,7 @@ void validateVPAsJwtWithInValidVCDateValidation() throws JsonProcessingException
     }
 
     @Test
-    void createPresentationAsJWT201() throws JsonProcessingException, ParseException {
+    void createPresentationAsJWT201() throws JsonProcessingException, ParseException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String did = DidWebFactory.fromHostnameAndPath(miwSettings.host(), bpn).toString();
         String audience = "companyA";
@@ -209,7 +210,7 @@ void createPresentationAsJWT201() throws JsonProcessingException, ParseException
         Assertions.assertEquals(iss, did);
     }
 
-    private ResponseEntity<Map> createBpnVCAsJwt(String bpn, String audience) throws JsonProcessingException {
+    private ResponseEntity<Map> createBpnVCAsJwt(String bpn, String audience) throws JsonProcessingException, JSONException {
         Map<String, Object> request = getIssueVPRequest(bpn);
 
         HttpHeaders headers = AuthenticationUtils.getValidUserHttpHeaders(bpn);
@@ -223,7 +224,7 @@ private ResponseEntity<Map> createBpnVCAsJwt(String bpn, String audience) throws
 
 
     @Test
-    void createPresentationAsJsonLD201() throws JsonProcessingException {
+    void createPresentationAsJsonLD201() throws JsonProcessingException, JSONException {
 
         String bpn = TestUtils.getRandomBpmNumber();
         String didWeb = DidWebFactory.fromHostnameAndPath(miwSettings.host(), bpn).toString();
@@ -241,7 +242,7 @@ void createPresentationAsJsonLD201() throws JsonProcessingException {
     }
 
     @Test
-    void createPresentationWithInvalidBPNAccess403() throws JsonProcessingException {
+    void createPresentationWithInvalidBPNAccess403() throws JsonProcessingException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String didWeb = DidWebFactory.fromHostnameAndPath(miwSettings.host(), bpn).toString();
 
@@ -257,7 +258,7 @@ void createPresentationWithInvalidBPNAccess403() throws JsonProcessingException
     }
 
     @NotNull
-    private Map<String, Object> getIssueVPRequest(String bpn) throws JsonProcessingException {
+    private Map<String, Object> getIssueVPRequest(String bpn) throws JsonProcessingException, JSONException {
         String baseBpn = miwSettings.authorityWalletBpn();
         String defaultLocation = miwSettings.host() + COLON_SEPARATOR + bpn;
         ResponseEntity<String> response = TestUtils.createWallet(bpn, bpn, restTemplate, baseBpn, defaultLocation);
@@ -278,7 +279,7 @@ private Map<String, Object> getIssueVPRequest(String bpn) throws JsonProcessingE
     }
 
     @NotNull
-    private ResponseEntity<Map> getIssueVPRequestWithShortExpiry(String bpn, String audience) throws JsonProcessingException {
+    private ResponseEntity<Map> getIssueVPRequestWithShortExpiry(String bpn, String audience) throws JsonProcessingException, JSONException {
         String baseBpn = miwSettings.authorityWalletBpn();
         String defaultLocation = miwSettings.host() + COLON_SEPARATOR + bpn;
         ResponseEntity<String> response = TestUtils.createWallet(bpn, bpn, restTemplate, baseBpn, defaultLocation);
diff --git a/src/test/java/org/eclipse/tractusx/managedidentitywallets/wallet/WalletTest.java b/src/test/java/org/eclipse/tractusx/managedidentitywallets/wallet/WalletTest.java
index 1beac2a56..92062d791 100644
--- a/src/test/java/org/eclipse/tractusx/managedidentitywallets/wallet/WalletTest.java
+++ b/src/test/java/org/eclipse/tractusx/managedidentitywallets/wallet/WalletTest.java
@@ -315,7 +315,7 @@ void storeCredentialsWithDifferentHolder403() throws JsonProcessingException {
     }
 
     @Test
-    void createWalletWithDuplicateBpn409() throws JsonProcessingException {
+    void createWalletWithDuplicateBpn409() throws JsonProcessingException, JSONException {
 
         String bpn = TestUtils.getRandomBpmNumber();
         String name = "Sample Wallet";
@@ -362,7 +362,7 @@ void getWalletByIdentifierWithInvalidBPNTest403() {
     }
 
     @Test
-    void getWalletByIdentifierBPNTest200() throws JsonProcessingException {
+    void getWalletByIdentifierBPNTest200() throws JsonProcessingException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String name = "Sample Name";
         String baseBpn = miwSettings.authorityWalletBpn();
@@ -386,7 +386,7 @@ void getWalletByIdentifierBPNTest200() throws JsonProcessingException {
 
 
     @Test
-    void getWalletByIdentifierBPNWithCredentialsTest200() throws JsonProcessingException {
+    void getWalletByIdentifierBPNWithCredentialsTest200() throws JsonProcessingException, JSONException {
         String bpn = TestUtils.getRandomBpmNumber();
         String name = "Sample Name";
         String did = DidWebFactory.fromHostnameAndPath(miwSettings.host(), bpn).toString();
@@ -416,7 +416,7 @@ void getWalletByIdentifierBPNWithCredentialsTest200() throws JsonProcessingExcep
 
     @Test
     @Disabled("the endpoint has an issue that prevents resolving did with a port number")
-    void getWalletByIdentifierDidTest200() throws JsonProcessingException {
+    void getWalletByIdentifierDidTest200() throws JsonProcessingException, JSONException {
 
         String bpn = TestUtils.getRandomBpmNumber();
         String name = "Sample Name";
@@ -462,7 +462,7 @@ void getWallets403() {
 
 
     @Test
-    void getWallets200() throws JsonProcessingException {
+    void getWallets200() throws JsonProcessingException, JSONException {
 
         String bpn = TestUtils.getRandomBpmNumber();
         String name = "Sample Name";
@@ -535,7 +535,7 @@ private ResponseEntity<Map> storeCredential(String bpn, String did) throws JsonP
     }
 
 
-    private List<Wallet> getWalletsFromString(String body) throws JsonProcessingException {
+    private List<Wallet> getWalletsFromString(String body) throws JsonProcessingException, JSONException {
         List<Wallet> walletList = new ArrayList<>();
 
         JSONArray array = new JSONArray(new JSONObject(body).getJSONArray("content"));