diff --git a/SenderTest/Certificates/certificate.cer b/SenderTest/Certificates/certificate.cer
new file mode 100644
index 0000000000000000000000000000000000000000..73f0387ee1b1ff8bdc9fe430d24b328c0e860b85
--- /dev/null
+++ b/SenderTest/Certificates/certificate.cer
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEyjCCArKgAwIBAgIIMIw7HOs7698wDQYJKoZIhvcNAQELBQAwJTEWMBQGA1UEAxMNZml0Y29u
+bmVjdC5kZTELMAkGA1UEBhMCREUwHhcNMjIwNjA4MTEwNzQ3WhcNMjcwNjA4MTEwNzUyWjAlMRYw
+FAYDVQQDEw1maXRjb25uZWN0LmRlMQswCQYDVQQGEwJERTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJxxbIieIEY9Vvql4R6ED5HqtGMjoJZ2xiwF5Zv/DuLseAZEUR7QuBvPG8CLcYOE
+JArXcAS5smLfG2LiNerMgDnrLGvBl3qrYOEq0kRIqGkSr5JM2V/bk2UgMToOJGQDBMh6IbU707Xp
+u1gHe2wuNxbJE4kALZV8zJX9fE2bc87o3URsw4yv3EnCpR3TskPI2uazNxKWVWjgpZ5yB6PQMbG0
+R7e0qGdEeIo5PpaxdkzbJUN4LwnEdZCKbXt3bMqr7wUJ4lXrqCUhO1Y57iR5YoNBTkKgJHV9fbcy
+EHs6IZAhxQCCyuczby5UDS4VzXvnqpxxnvI/rv12nc2WPPctvmA3AyHOH7hTugg7UZ75UKFFHqfU
+TeY6lWkifUpTpWVZ3Krm0+3Ja/VZzufPSybifTR9v5JMxQdwaqp9E53Cqh1csqciLVazDOjU6Lhn
+fjLr4GwSri1FveXDqpq/jJhkTbuDL1fAEs+eDauD3vNxb0Bverpb5/7rOcAKTH0GEzZhSHV23fyP
+DpKmpi5h0py42SdbBAZat8C1StMQ7m3UxuDdoMg+zRS5d12d6s0ZFf2xwFCjDVNVN6y7BkSGuA2l
+2/I5ojXhK/Wm+DAcKT/osZznyNq4OlHL2ck6LOSSgFCJFrdkpku++gROx2xjUIFQjryUkcPZ6y0l
+PLXAHJUEGO97AgMBAAEwDQYJKoZIhvcNAQELBQADggIBADXJ6LP4HdnUiFCgQR8PoY+fR8XCnYx8
+FdVB9v9xdsBhE1/B1c8z6kUInQdq2NfsRjyfgA1wIdPElP+b1bu/TKS/GpWrsPHUXDRv67qT13cB
+rw8I6rHTDdnF00pEU4mabI32EqGnEAwu8DGlKnDbnh/dY7IQjYK40/ZutcqzybzvBiNFoYu7rKXg
+7CThPwc92fnPfFcDJJMU9YlA5C6MaLSxDj0e3z1rl+ew9pab8gclnbzgxGOqFMNPhNRHx0SvFrCF
+dPzva9mYDATHgR66hJAo/hov8qJnz6/7xkQgFPy4jHwBk2ubM2SN8+UEyklm7u3v8X6mpvdE7/gC
+qWJYJjcpzz7QEBmvJ9yYIALNo8E9UyZNfYgE/hEyBpEccNk7z6y/yHNThcojwbfmYjztl5Ed4uHY
+i1ycf5LYcSAxtzD6V5CuIVzmPNkSgB1m8Wu/+5Sy2/uQGIKNK/X6E9f1GjTDBv5KzxOoongc4yri
+VinYgmrpoF6Uh6G423IGT6/+SpyQa5oegpSbKKDcSAQKK/fCJQbck03WTbpgKDhc0KDLB2C07yiI
+RNgSDRO+eg8BTFjxE3uPVwY8AP+QxK2+Xn5ozuT7aedeS41MQYeeatd6StNy809DvIMb44ZUA6JU
+/n8Ok8eHWVY+aShfomcLyH7+EeL9e2LTSp0geUdmsnNI
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/SenderTest/Certificates/certificate.pfx b/SenderTest/Certificates/certificate.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..ec4092f2c68e0c8865fe9333be770dd09fb5c6f9
Binary files /dev/null and b/SenderTest/Certificates/certificate.pfx differ
diff --git a/SenderTest/SenderEncryptionWithImportedCertificateTest.cs b/SenderTest/SubscriberEncryptionWithImportedCertificateTest.cs
similarity index 87%
rename from SenderTest/SenderEncryptionWithImportedCertificateTest.cs
rename to SenderTest/SubscriberEncryptionWithImportedCertificateTest.cs
index 16507d1f6b673b43b404fe61a79583a65b4ba328..d815ec9ffaf06fa5fe6f2ec1f9b3c600c2252c3b 100644
--- a/SenderTest/SenderEncryptionWithImportedCertificateTest.cs
+++ b/SenderTest/SubscriberEncryptionWithImportedCertificateTest.cs
@@ -6,24 +6,23 @@ using NUnit.Framework;
 namespace SenderTest;
 
 public class SenderEncryptionWithImportedCertificateTest {
-    private Sender _sender = null!;
+    private Subscriber _subscriber = null!;
     private ILogger _logger = null!;
 
     [OneTimeSetUp]
     public void OneTimeSetUp() {
         // Import certificate
-        
     }
 
     [SetUp]
     public void SetUp() {
         // Create a new Sender
-        var fileName = "certificate.pfx";
+        var fileName = "../../../certificate.pfx";
         var cert = new X509Certificate2(fileName);
         _logger = LoggerFactory.Create(cfg => cfg.AddConsole())
             .CreateLogger<SenderEncryptionWithSelfSignedCertificateTest>();
 
-        _sender = new Sender(_logger,
+        _subscriber = new Subscriber(_logger,
             FitConnectEndpoints.Create(FitConnectEndpoints.EndpointType.Development), cert);
     }