diff --git a/Sources/Issuers/IssuanceRequester.swift b/Sources/Issuers/IssuanceRequester.swift
index 26c9be1..39291a2 100644
--- a/Sources/Issuers/IssuanceRequester.swift
+++ b/Sources/Issuers/IssuanceRequester.swift
@@ -92,7 +92,6 @@ public actor IssuanceRequester: IssuanceRequesterType {
             
             switch credential.requestedCredentialResponseEncryption {
             case .notRequested:
-              // TODO: Decode SingleIssuanceSuccessResponse
               throw ValidationError.error(reason: "Issuer expects response encryption")
             case .requested(
               _,
diff --git a/Sources/Main/Resolvers/CredentialOffer/CredentialOfferRequestResolver.swift b/Sources/Main/Resolvers/CredentialOffer/CredentialOfferRequestResolver.swift
index 38a5279..2cbfda7 100644
--- a/Sources/Main/Resolvers/CredentialOffer/CredentialOfferRequestResolver.swift
+++ b/Sources/Main/Resolvers/CredentialOffer/CredentialOfferRequestResolver.swift
@@ -138,7 +138,7 @@ public actor CredentialOfferRequestResolver {
     
     do {
       let credentialIssuerId = credentialIssuerMetadata.credentialIssuerIdentifier
-      let credentials: [CredentialIdentifier] = try credentialOfferRequestObject.credentials.map { try CredentialIdentifier(value: $0.stringValue) }
+      let credentials: [CredentialIdentifier] = credentialOfferRequestObject.credentials.compactMap { try? CredentialIdentifier(value: $0.stringValue) }
       let grants = try credentialOfferRequestObject.grants?.toDomain()
       return try .init(
         credentialIssuerIdentifier: credentialIssuerId,
diff --git a/Tests/Constants/TestsConstants.swift b/Tests/Constants/TestsConstants.swift
index d7b25e5..cebb839 100644
--- a/Tests/Constants/TestsConstants.swift
+++ b/Tests/Constants/TestsConstants.swift
@@ -17,13 +17,13 @@ import Foundation
 @testable import OpenID4VCI
 
 //let CredentialIssuer_URL = "http://localhost:8080"
-let CredentialIssuer_URL = "https://preprod.issuer.eudiw.dev/oidc"
-//let CredentialIssuer_URL = "https://eudi.netcompany-intrasoft.com/pid-issuer"
+//let CredentialIssuer_URL = "https://preprod.issuer.eudiw.dev/oidc"
+let CredentialIssuer_URL = "https://eudi.netcompany-intrasoft.com/pid-issuer"
 
-//let PID_SdJwtVC_SCOPE = "eu.europa.ec.eudiw.pid_vc_sd_jwt"
-//let PID_MsoMdoc_SCOPE = "eu.europa.ec.eudiw.pid_mso_mdoc"
-let PID_SdJwtVC_SCOPE = "eu.europa.ec.eudiw.pid_jwt_vc_json"
-let PID_MsoMdoc_SCOPE = "eu.europa.ec.eudiw.pid_mdoc"
+let PID_SdJwtVC_SCOPE = "eu.europa.ec.eudiw.pid_vc_sd_jwt"
+let PID_MsoMdoc_SCOPE = "eu.europa.ec.eudiw.pid_mso_mdoc"
+//let PID_SdJwtVC_SCOPE = "eu.europa.ec.eudiw.pid_jwt_vc_json"
+//let PID_MsoMdoc_SCOPE = "eu.europa.ec.eudiw.pid_mdoc"
 
 let All_Supported_CredentialOffer = """
     {
diff --git a/Tests/Helpers/Wallet.swift b/Tests/Helpers/Wallet.swift
index 9cb4047..084639c 100644
--- a/Tests/Helpers/Wallet.swift
+++ b/Tests/Helpers/Wallet.swift
@@ -249,7 +249,7 @@ extension Wallet {
       
       // Depending on the mode selected, changes might be
       // required on the tests constants file (endpoints, scopes)
-      let walletMode: WalletMode = .requiresIntervention
+      let walletMode: WalletMode = .doesNorRequireIntervention
       
       switch walletMode {
       case .doesNorRequireIntervention: