diff --git a/core/src/test/resources/trusted-test-root-certificates/TEST-PCA20.pem b/client/src/test/resources/trusted-test-root-certificates/TEST-PCA20.pem
similarity index 100%
rename from core/src/test/resources/trusted-test-root-certificates/TEST-PCA20.pem
rename to client/src/test/resources/trusted-test-root-certificates/TEST-PCA20.pem
diff --git a/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
index 9c5f29a57e62499b15ada49591ca726cb31161ed..4b2dab852132b8a235fe76e8d840d3ace7603462 100644
--- a/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/validation/DefaultValidationService.java
@@ -239,17 +239,17 @@ public class DefaultValidationService implements ValidationService {
 
     private List<String> loadTrustedRootCertificates() {
 
-        List<X509Certificate> trustedRootCertificates = rootCertificates.stream()
-                .map(FileUtil::convertToX509Certificate).collect(Collectors.toList());
-        List<String> encodedCertificates = trustedRootCertificates.stream().map(cert -> {
-            try {
-                return Base64.encode(cert.getEncoded()).toString();
-            } catch (CertificateEncodingException e) {
-                throw new RootCertificateException(e);
-            }
-        }).collect(Collectors.toList());
-
-        return encodedCertificates;
+        List<String> trustedRootCertificates = rootCertificates.stream()
+                .map(FileUtil::convertToX509Certificate)
+                .map(cert -> {
+                    try {
+                        return Base64.encode(cert.getEncoded()).toString();
+                    } catch (CertificateEncodingException e) {
+                        throw new RootCertificateException(e);
+                    }
+                }).collect(Collectors.toList());
+
+        return trustedRootCertificates;
     }
 
     private boolean isProxySet() {