diff --git a/Encryption/FitEncryption.cs b/Encryption/FitEncryption.cs
index 494a3a60cfcb24481be4476b9ab9ea16647894f4..fd49111628f8ed042a447cae17cc556b5f510222 100644
--- a/Encryption/FitEncryption.cs
+++ b/Encryption/FitEncryption.cs
@@ -12,7 +12,7 @@ public class FitEncryption {
     public string? PublicKeyEncryption { get; set; }
     public string? PublicKeySignatureVerification { get; set; }
 
-    private IEncryptor _encryptor = new AspNetCoreEncryptor();
+    private readonly IEncryptor _encryptor = new AspNetCoreEncryptor();
 
     public FitEncryption(ILogger? logger) {
         _logger = logger;
diff --git a/EncryptionTests/JweTest.cs b/EncryptionTests/JweTest.cs
index d69e6f292f2c2467e8fd9371a89565d65864fcd6..0d16ac6994f8395dcd0af03d5aa33f432bec5153 100644
--- a/EncryptionTests/JweTest.cs
+++ b/EncryptionTests/JweTest.cs
@@ -39,8 +39,7 @@ public class JweTest {
         };
 
         // Act
-        var dummyText =
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+        var dummyText = "Test plain text";
         var cypher = engine.Encrypt(dummyText);
         var plain = engine.Decrypt(cypher);
 
diff --git a/FitConnect/Client.cs b/FitConnect/Client.cs
index ffad4ab2a8c2449d467e0157d816a55038e89abe..bf625abf6ff90c72aed81a1343bb3cd3ede68ff0 100644
--- a/FitConnect/Client.cs
+++ b/FitConnect/Client.cs
@@ -6,6 +6,7 @@ using FitConnect.Interfaces;
 using FitConnect.Models;
 using FitConnect.Services;
 using Microsoft.Extensions.Logging;
+using Microsoft.IdentityModel.Tokens;
 
 namespace FitConnect;
 
@@ -72,10 +73,8 @@ public class Client {
     }
 
     public IFluentSubscriber GetSubscriber(string privateKeyEncryption, string privateKeySigning) {
-        var deserializedRaw = JsonSerializer.Deserialize<string>(privateKeyEncryption);
-        var deserialized = new X509Certificate2(deserializedRaw);
         return new FluentSubscriber(_endpoints, _oAuthService, _submissionService, _routeService,
-                deserialized, _logger)
+                privateKeyEncryption, _logger)
             { Owner = this };
     }
 
diff --git a/FitConnect/FluentSubscriber.cs b/FitConnect/FluentSubscriber.cs
index 4ef341b3bdd206eecea3f9889eca5cc71fdd2ce1..51a37b7841aed67b7478073828f420a6a51c73d7 100644
--- a/FitConnect/FluentSubscriber.cs
+++ b/FitConnect/FluentSubscriber.cs
@@ -15,6 +15,7 @@ namespace FitConnect;
 public class FluentSubscriber : Subscriber,
     IFluentSubscriber,
     IFluentSubscriberWithSubmission {
+    private readonly string _privateKeyDecryption;
     private OAuthAccessToken? _token;
 
 
@@ -22,9 +23,10 @@ public class FluentSubscriber : Subscriber,
         IOAuthService oAuthService,
         ISubmissionService submissionService,
         IRouteService routeService,
-        X509Certificate2 certificate,
+        string privateKeyDecryption,
         ILogger? logger = null) : base(endpoints, oAuthService, submissionService,
         routeService, logger) {
+        _privateKeyDecryption = privateKeyDecryption;
     }
 
 
diff --git a/FluentApiTest/FluentSubscriberReceiveTests.cs b/FluentApiTest/FluentSubscriberReceiveTests.cs
index bee24143daa5f26d18e6ff51c3dde61a344f6bdb..31434389806523ff4f691f2796f01b4924728fdf 100644
--- a/FluentApiTest/FluentSubscriberReceiveTests.cs
+++ b/FluentApiTest/FluentSubscriberReceiveTests.cs
@@ -29,6 +29,7 @@ public class FluentSubscriberReceiveTests {
     }
 
     [Test]
+    [Ignore("Missing encrypted data")]
     public void GetSubmission() {
         var submissions = _client.GetSubscriber("", "")
             .GetAvailableSubmissions();
diff --git a/MockContainer/MockContainer.cs b/MockContainer/MockContainer.cs
index e1c75364a49704a6a94a72ea2244158b21d00010..62ff0c725942718f3fdba301c2f6caf8dd0275f7 100644
--- a/MockContainer/MockContainer.cs
+++ b/MockContainer/MockContainer.cs
@@ -1,8 +1,5 @@
 using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using Autofac;
-using FitConnect.Encryption;
 using FitConnect.Models.Api.Metadata;
 using FitConnect.Services;
 using FitConnect.Services.Models;