diff --git a/roles/mail_server/molecule/default/cleanup.yml b/roles/mail_server/molecule/default/cleanup.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c99ee79c29bc84b49f955fbcdf8734cda064bc64
--- /dev/null
+++ b/roles/mail_server/molecule/default/cleanup.yml
@@ -0,0 +1,15 @@
+---
+
+- name: Clean-up fixtures
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  tasks:
+
+    - name: Remove X.509 material
+      file:
+        path: "{{ item }}"
+        state: absent
+      with_items:
+        - "tests/data/x509"
+        - "tests/data/.gimmecert"
diff --git a/roles/mail_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/mail_server/molecule/default/group_vars/parameters-mandatory.yml
index e23f203b4c07ffbc316f8d9ffd2607fdb87a1e11..24be01138174a11906b8ec3ce9f3b795d0b38cda 100644
--- a/roles/mail_server/molecule/default/group_vars/parameters-mandatory.yml
+++ b/roles/mail_server/molecule/default/group_vars/parameters-mandatory.yml
@@ -2,16 +2,16 @@
 
 mail_ldap_base_dn: dc=local
 mail_ldap_url: ldap://ldap-server/
-mail_ldap_tls_truststore: "{{ lookup('file', 'tests/data/x509/truststore.pem') }}"
+mail_ldap_tls_truststore: "{{ lookup('file', 'tests/data/x509/ca/chain-full.cert.pem') }}"
 mail_ldap_postfix_password: postfixpassword
 mail_ldap_dovecot_password: dovecotpassword
 
-imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_imap.cert.pem') }}"
-imap_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_imap.key.pem') }}"
+imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.cert.pem') }}"
+imap_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.key.pem') }}"
 
-smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_smtp.cert.pem') }}"
-smtp_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_smtp.key.pem') }}"
+smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.cert.pem') }}"
+smtp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.key.pem') }}"
 
 # common
 ca_certificates:
-  testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"
diff --git a/roles/mail_server/molecule/default/group_vars/parameters-optional.yml b/roles/mail_server/molecule/default/group_vars/parameters-optional.yml
index 45e2a4f49ed19fbc0c2210195f5e1b40e9d7801a..000ec39fd46f9d6cf261f68d72a88d5dc28969d3 100644
--- a/roles/mail_server/molecule/default/group_vars/parameters-optional.yml
+++ b/roles/mail_server/molecule/default/group_vars/parameters-optional.yml
@@ -2,7 +2,7 @@
 
 mail_ldap_base_dn: dc=local
 mail_ldap_url: ldap://ldap-server/
-mail_ldap_tls_truststore: "{{ lookup('file', 'tests/data/x509/truststore.pem') }}"
+mail_ldap_tls_truststore: "{{ lookup('file', 'tests/data/x509/ca/chain-full.cert.pem') }}"
 mail_ldap_postfix_password: postfixpassword
 mail_ldap_dovecot_password: dovecotpassword
 mail_server_tls_protocols:
@@ -15,12 +15,12 @@ mail_user: virtmail
 mail_user_uid: 5000
 mail_user_gid: 5000
 imap_max_user_connections_per_ip: 2
-imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_imap.cert.pem') }}"
-imap_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_imap.key.pem') }}"
+imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.cert.pem') }}"
+imap_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.key.pem') }}"
 local_mail_aliases:
   root: "john.doe@domain1"
-smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_smtp.cert.pem') }}"
-smtp_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_smtp.key.pem') }}"
+smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.cert.pem') }}"
+smtp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.key.pem') }}"
 imap_folder_separator: "."
 smtp_rbl:
   - bl.spamcop.net
@@ -33,7 +33,7 @@ mail_message_size_limit: 20480001
 
 # common
 ca_certificates:
-  testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"
 
 # backup_client (backup username should end in -s64 for Stretch).
 enable_backup: true
diff --git a/roles/mail_server/molecule/default/host_vars/ldap-server.yml b/roles/mail_server/molecule/default/host_vars/ldap-server.yml
index 8d435d5403040d2bbb805a1ca3195a012374bdc0..a4bba319945577af97899dc9de15ab7d6245749c 100644
--- a/roles/mail_server/molecule/default/host_vars/ldap-server.yml
+++ b/roles/mail_server/molecule/default/host_vars/ldap-server.yml
@@ -14,12 +14,12 @@ ldap_server_domain: "local"
 ldap_server_groups:
   - name: mail
 ldap_server_organization: "Example"
-ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/ldap-server_ldap.cert.pem') }}"
-ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/ldap-server_ldap.key.pem') }}"
+ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/ldap-server_ldap.cert.pem') }}"
+ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/server/ldap-server_ldap.key.pem') }}"
 
 # common
 ca_certificates:
-  testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"
 
 # ldap_client
 ldap_client_config:
diff --git a/roles/mail_server/molecule/default/molecule.yml b/roles/mail_server/molecule/default/molecule.yml
index acf4b72d4db28dc4df5fae4aa9daf6a91cefa641..1367899784937cd530a7c7522c103343fc66db70 100644
--- a/roles/mail_server/molecule/default/molecule.yml
+++ b/roles/mail_server/molecule/default/molecule.yml
@@ -57,7 +57,7 @@ platforms:
       - parameters-mandatory
       - stretch
     box: debian/contrib-stretch64
-    memory: 1024
+    memory: 1536
     cpus: 1
     interfaces:
       - auto_config: true
@@ -70,7 +70,7 @@ platforms:
       - parameters-optional
       - stretch
     box: debian/contrib-stretch64
-    memory: 1024
+    memory: 1536
     cpus: 1
     interfaces:
       - auto_config: true
@@ -80,6 +80,8 @@ platforms:
 
 provisioner:
   name: ansible
+  playbooks:
+    cleanup: cleanup.yml
   config_options:
     defaults:
       force_valid_group_names: "ignore"
diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml
index e520de33671019b843863662ca8b28f9506735be..75d92fbcc90b2fca4ef67f3489196775f43b5659 100644
--- a/roles/mail_server/molecule/default/prepare.yml
+++ b/roles/mail_server/molecule/default/prepare.yml
@@ -1,5 +1,46 @@
 ---
 
+- name: Set-up fixtures
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  tasks:
+
+    - name: Initialise CA hierarchy
+      command: "gimmecert init"
+      args:
+        creates: "tests/data/.gimmecert/ca/level1.cert.pem"
+        chdir: "tests/data/"
+
+    - name: Generate server private keys and certificates
+      command:
+      args:
+        chdir: "tests/data/"
+        creates: "tests/data/.gimmecert/server/{{ item.name }}.cert.pem"
+        argv:
+          - "gimmecert"
+          - "server"
+          - "{{ item.name }}"
+          - "{{ item.fqdn }}"
+          - "{{ item.fqdn[:item.fqdn.rfind('-')] }}"
+      with_items:
+        - name: ldap-server_ldap
+          fqdn: ldap-server
+        - name: parameters-mandatory-stretch64_imap
+          fqdn: parameters-mandatory-stretch64
+        - name: parameters-mandatory-stretch64_smtp
+          fqdn: parameters-mandatory-stretch64
+        - name: parameters-optional-stretch64_imap
+          fqdn: parameters-optional-stretch64
+        - name: parameters-optional-stretch64_smtp
+          fqdn: parameters-optional-stretch64
+
+    - name: Set-up link to generated X.509 material
+      file:
+        src: ".gimmecert"
+        dest: "tests/data/x509"
+        state: link
+
 - name: Prepare
   hosts: all
   gather_facts: false
@@ -87,7 +128,7 @@
 
     - name: Deploy CA certificate
       copy:
-        src: tests/data/x509/ca.cert.pem
+        src: tests/data/x509/ca/level1.cert.pem
         dest: /usr/local/share/ca-certificates/testca.crt
         owner: root
         group: root
diff --git a/roles/mail_server/molecule/default/tests/data/x509/ca.cert.pem b/roles/mail_server/molecule/default/tests/data/x509/ca.cert.pem
deleted file mode 100644
index a41785fdd72787232ac39d645f36d2a0b7b04c11..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/ca.cert.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEWTCCAsGgAwIBAgIMWVEJAy6O6Abooz68MA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI2MTMxNTQ3WhcNMzcwNjIxMTMx
-NTQ3WjBIMSIwIAYDVQQDExlFeGFtcGxlIEluYy4gVGVzdCBTaXRlIENBMRUwEwYD
-VQQKEwxFeGFtcGxlIEluYy4xCzAJBgNVBAYTAlNFMIIBojANBgkqhkiG9w0BAQEF
-AAOCAY8AMIIBigKCAYEAufYIYdFLn8Xo8a3c0cUj7s9WEUYKDE6ETmsNFdZee2hK
-qP2Li9bSr+vPjgMfi2UfxX/+i9x6LGqsIUxXVgrKlOf7R8bFg/runUI+4X1mZMJw
-dBc1POhjkdfRbtfOdu1LtztW4Pc2tnyrAtmhcNHUCXNGRfDNpFKtIFe4OTA/4/eP
-1EAyInHNqO2F8UgL8EDUMg9AQd4InVCPYRNlsv9j9qBVMjZiX7hoBC8k1laNkd4T
-IdV6zet3+M5Fp/W9lvxFI1yPXw/xWM7K9R3nepunKniuGmjBsac/ZHCUFqJaHz5K
-pXyMpSH1GTXOnIKFOldK4NYOzjCOR9Z+k63oJPZ+c7R9cKAZ7DERhS8X6MiykQ2s
-hDY68i7HSZd9Dy5oLlH63evbi/tWJSG9mE/UamYuzORKR4PNwixaKQbteiDU59wK
-azH5yQNGIqMSGkNgSsj9QW2NPkyNskuzCP04f77V/wSpum5PIygyuLidge9A+Vux
-eb5v7XBS8Zp3Wn78JYrlAgMBAAGjQzBBMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0P
-AQH/BAUDAwcGADAdBgNVHQ4EFgQUN2vbkxxpfpJMa99zhfiEllmBT2swDQYJKoZI
-hvcNAQELBQADggGBADNZ9eJA3Jm5TJQoDct+FZOc16XZDlteGBxVJj+aQUlBFlJK
-itvW/reR4SwZF/QRtCIzY7HN0rx0FVvfGR4sIcN2MALG+4Beee5nZR3KsNHhx895
-5ml7vqfNhnn/3/Gd7quqb2FskALfHAciuL+y0n/KcnnJ/3wZKR6xc5ON1VrwHSyI
-ENxRC8/oeO9SBc9V5gG5CyELftUiGBE73IIGjV/wXiwBvgwPB+j8vrv5nQrKPsLk
-b9ngSts/JSdiQH3cIbBpNoWz8Q8OIoQTt99GUKAScJX4UO7W5EHNmcCtCtOpgRg+
-Y49auOe/6A1n4rsLANZlDelhwCASQtZ04DdFl5QQpTuIOmd4l4KuNpqQ5Px+sxFu
-oPenBiQkXuQn9rQaFTTSc9jVBoumRp61P0mvoGusRzjYYvdL8zYoH/246eliWgyy
-60+/lgmDXpwf0a2d3fDTxuBmP1HlJYLUsS6ij+GKGgAOTCGmzygmyPOroDae+XOI
-G2o8G6ziU8d8RICIng==
------END CERTIFICATE-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/ca.key.pem b/roles/mail_server/molecule/default/tests/data/x509/ca.key.pem
deleted file mode 100644
index d2f3ab97e995f18f395d78cd62af20368aeb7b0f..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/ca.key.pem
+++ /dev/null
@@ -1,182 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: High (3072 bits)
-
-modulus:
-	00:b9:f6:08:61:d1:4b:9f:c5:e8:f1:ad:dc:d1:c5:23
-	ee:cf:56:11:46:0a:0c:4e:84:4e:6b:0d:15:d6:5e:7b
-	68:4a:a8:fd:8b:8b:d6:d2:af:eb:cf:8e:03:1f:8b:65
-	1f:c5:7f:fe:8b:dc:7a:2c:6a:ac:21:4c:57:56:0a:ca
-	94:e7:fb:47:c6:c5:83:fa:ee:9d:42:3e:e1:7d:66:64
-	c2:70:74:17:35:3c:e8:63:91:d7:d1:6e:d7:ce:76:ed
-	4b:b7:3b:56:e0:f7:36:b6:7c:ab:02:d9:a1:70:d1:d4
-	09:73:46:45:f0:cd:a4:52:ad:20:57:b8:39:30:3f:e3
-	f7:8f:d4:40:32:22:71:cd:a8:ed:85:f1:48:0b:f0:40
-	d4:32:0f:40:41:de:08:9d:50:8f:61:13:65:b2:ff:63
-	f6:a0:55:32:36:62:5f:b8:68:04:2f:24:d6:56:8d:91
-	de:13:21:d5:7a:cd:eb:77:f8:ce:45:a7:f5:bd:96:fc
-	45:23:5c:8f:5f:0f:f1:58:ce:ca:f5:1d:e7:7a:9b:a7
-	2a:78:ae:1a:68:c1:b1:a7:3f:64:70:94:16:a2:5a:1f
-	3e:4a:a5:7c:8c:a5:21:f5:19:35:ce:9c:82:85:3a:57
-	4a:e0:d6:0e:ce:30:8e:47:d6:7e:93:ad:e8:24:f6:7e
-	73:b4:7d:70:a0:19:ec:31:11:85:2f:17:e8:c8:b2:91
-	0d:ac:84:36:3a:f2:2e:c7:49:97:7d:0f:2e:68:2e:51
-	fa:dd:eb:db:8b:fb:56:25:21:bd:98:4f:d4:6a:66:2e
-	cc:e4:4a:47:83:cd:c2:2c:5a:29:06:ed:7a:20:d4:e7
-	dc:0a:6b:31:f9:c9:03:46:22:a3:12:1a:43:60:4a:c8
-	fd:41:6d:8d:3e:4c:8d:b2:4b:b3:08:fd:38:7f:be:d5
-	ff:04:a9:ba:6e:4f:23:28:32:b8:b8:9d:81:ef:40:f9
-	5b:b1:79:be:6f:ed:70:52:f1:9a:77:5a:7e:fc:25:8a
-	e5:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	00:ae:08:f9:f3:41:c2:fa:b6:67:b9:b7:33:50:06:a6
-	08:5b:76:7b:18:07:53:59:30:2d:8b:b6:65:57:88:79
-	0a:33:c5:4f:f4:87:5c:f7:34:b9:06:38:2b:e8:1b:b6
-	fa:33:06:04:9d:b4:2b:8a:e2:12:51:df:76:65:0a:18
-	69:9f:69:e5:d4:bb:09:37:90:95:10:68:74:f3:bd:1e
-	53:72:96:d3:19:79:f5:2b:2a:54:c6:a6:6b:c5:c8:3b
-	70:7e:fd:43:e3:aa:b9:43:b4:0c:ff:cf:d9:6d:12:92
-	d4:7d:53:a9:25:21:ef:c5:88:4d:1a:8b:48:ca:45:20
-	fe:91:56:dc:f5:8e:92:df:1c:57:9e:e1:1e:c2:3d:89
-	0e:8e:03:03:ea:20:f8:02:f2:60:1d:43:e0:0b:d3:44
-	24:8e:0c:ed:bf:43:f5:bd:49:6b:91:0b:72:a4:f2:3d
-	2f:8e:cc:3d:54:7e:de:fe:1a:96:41:4e:5d:87:9f:84
-	5b:3c:92:8c:a7:73:e4:00:6a:13:02:44:d7:ad:89:31
-	50:ee:d2:ec:af:6e:47:e4:9b:59:3d:93:58:d5:71:1e
-	64:f7:ac:68:85:ca:86:f7:6a:25:b0:ff:56:77:af:f4
-	50:43:49:0b:22:31:6b:79:6f:f2:74:df:7c:1b:e1:4d
-	12:e7:ba:1e:65:38:ad:27:38:3b:50:6d:d0:e6:36:0e
-	b9:25:27:d8:31:e4:2e:be:01:b4:d8:fe:70:d2:12:ff
-	bb:7b:3f:f4:dc:51:83:17:33:8e:26:68:d1:89:3e:e5
-	67:00:72:e0:0f:92:83:ba:62:55:db:ae:84:7d:5e:cc
-	7f:72:d0:dc:f3:88:9e:22:07:78:9a:e1:4e:e3:34:30
-	14:56:fb:80:93:f2:be:c3:cd:70:1b:fe:b0:da:41:3c
-	28:9f:a8:0e:1c:79:1b:52:9a:a8:a8:cf:0e:16:f9:c0
-	db:99:e9:df:4a:c3:66:7c:4f:a1:27:eb:f0:06:5e:4d
-	41:
-
-prime1:
-	00:f7:41:ab:a5:a1:23:37:e6:be:fe:85:e9:96:30:1b
-	c4:33:50:c8:85:5e:44:46:51:1d:3d:28:8a:21:58:2d
-	3b:82:11:dc:bc:0d:76:c5:20:45:a2:34:c9:cb:85:3b
-	de:76:06:bc:c1:9f:4d:39:c3:63:ad:5d:0d:fe:bc:ab
-	3f:2c:76:67:29:d9:a5:3d:38:af:a3:09:ff:09:ec:e9
-	15:85:04:e6:70:87:2e:ee:a0:78:26:73:a0:74:60:18
-	ad:f7:8c:1a:f3:4c:07:53:b9:b8:9d:a6:d1:3f:8b:a3
-	13:87:16:a0:40:11:36:9b:f4:1e:b1:ba:b9:00:34:15
-	d2:29:0d:e8:90:f7:c5:dc:c1:93:d3:e5:6e:6c:13:24
-	0f:11:cb:0d:37:ea:f9:f9:89:8e:91:71:4f:1d:5b:17
-	f8:aa:94:8d:43:bf:ac:dd:d6:ec:3c:bc:70:d1:51:13
-	76:77:ef:9a:91:6d:4d:59:32:e6:97:93:d8:bb:14:60
-	fd:
-
-prime2:
-	00:c0:89:79:a8:73:86:20:c7:e9:0d:35:56:a4:d0:a8
-	37:21:76:25:e9:2f:9f:c0:e6:45:f6:27:54:56:4a:dd
-	0e:c5:43:e4:ec:c5:20:97:16:5b:fc:ef:86:57:b1:e6
-	ce:8b:e9:58:d4:a4:c3:a0:6d:f6:57:6d:8a:09:eb:d1
-	de:63:42:81:76:9f:4c:40:f7:48:d3:99:1b:23:7d:eb
-	8e:52:7b:e8:94:94:f3:d5:49:49:6e:da:38:c2:f6:b6
-	0e:27:7a:f9:4d:2b:6c:aa:a0:de:c7:b1:78:06:ee:7c
-	5f:7e:33:6d:05:44:9b:9a:ca:90:12:61:a4:96:46:9b
-	66:d1:8b:4c:e9:f1:21:2f:6c:26:aa:4f:56:3d:d7:03
-	8c:bf:33:24:a5:01:f5:87:a3:b2:d9:2b:82:2b:42:c4
-	5a:5d:40:84:d2:d8:7d:29:6f:69:21:a2:0b:ca:7c:46
-	34:b7:8f:29:11:2f:62:3e:87:a0:62:50:34:21:89:4a
-	09:
-
-coefficient:
-	0b:7d:31:bf:b5:89:0a:c8:2c:28:4c:41:98:ee:6f:55
-	e5:69:d3:b2:1c:66:c4:da:1d:79:2d:8b:03:28:30:a3
-	c9:6f:7e:94:a2:72:76:ce:1a:32:27:c6:f9:78:ae:d7
-	d0:d8:af:a1:76:54:ff:2b:97:a4:5d:b5:ea:f6:a5:b3
-	08:a1:9c:46:7c:7d:80:38:32:a9:e4:09:7d:b0:e4:1f
-	e2:e8:e0:ef:84:f4:07:8e:4c:bc:02:72:ad:43:e6:c7
-	5a:e7:77:d1:81:27:8e:a6:bb:23:dd:14:69:cb:08:02
-	68:97:b8:ff:7f:c0:4f:43:86:d1:d8:8e:7e:9a:ae:1d
-	c5:ee:ae:19:03:d9:cb:f1:31:b5:7b:72:6c:cb:f8:d1
-	c1:07:9a:e5:09:8f:2a:7a:92:4b:e9:1e:a0:7d:aa:ae
-	bd:87:60:be:77:b7:ab:de:c9:54:13:e9:6a:3c:82:cb
-	94:e2:4c:bc:35:36:12:d6:0f:e1:77:58:ff:08:4e:38
-	
-
-exp1:
-	00:cb:b2:2f:5d:91:45:b9:5d:00:86:20:fe:51:fb:aa
-	34:55:ee:3c:74:1b:37:f6:12:07:1b:86:55:5d:a9:0e
-	02:93:62:71:cd:fe:ed:94:f2:c4:4b:20:60:0a:a9:e5
-	ab:9c:e2:6a:08:bd:5b:5a:b6:0c:5d:1b:67:57:30:49
-	88:0e:f2:30:85:3a:c7:b5:8b:08:af:31:a2:09:a4:42
-	55:b7:33:55:40:e9:2d:91:eb:63:70:92:1b:63:24:73
-	d0:86:3a:c7:4d:1e:9a:7e:b0:67:56:81:c2:ab:2e:37
-	97:f3:d7:81:07:a6:e6:ad:4e:4d:27:30:64:0e:b5:da
-	30:3c:20:38:33:8d:dc:54:c4:a9:2b:8d:3d:0e:0e:2a
-	cb:bb:65:e3:aa:e8:8b:2d:b7:d4:5b:1f:d5:04:a3:32
-	39:6b:16:5c:d6:ae:87:14:6f:66:49:97:18:fe:68:63
-	b7:5a:91:6b:6e:59:74:ba:82:83:93:e6:7a:4b:8d:3b
-	65:
-
-exp2:
-	17:76:29:1e:ff:c4:ce:65:cd:de:50:2b:98:b5:dc:69
-	ab:68:2c:42:78:0d:2d:82:61:f0:16:e6:ce:05:1d:5e
-	d9:66:e6:94:7b:88:f7:20:40:61:58:06:b4:d4:f6:dd
-	20:6b:74:e9:a4:92:3a:10:6c:3e:47:18:d5:10:a9:68
-	42:0c:2e:9e:77:d6:e0:eb:c1:32:17:ac:18:ed:15:31
-	28:97:f4:c5:76:49:28:2a:60:0a:64:09:1a:a8:d9:92
-	6b:f9:2e:3b:db:18:c8:ca:05:9b:ab:e2:86:65:b5:3e
-	25:b0:ba:8e:33:c8:0a:5a:b8:a7:a4:c2:5b:95:8b:06
-	42:6e:89:16:d0:cd:4c:6c:0f:62:1d:7c:d2:d8:4a:94
-	72:10:17:5d:0c:1a:11:47:3f:59:fb:55:47:54:41:7d
-	09:73:fd:3b:7c:29:f4:4c:a1:30:fa:00:19:d2:7e:f3
-	99:92:96:5c:83:bb:a3:06:ff:e2:3b:07:bf:36:6d:91
-	
-
-
-Public Key PIN:
-	pin-sha256:PbmtyJHWZjCUw6fCLCaAjguYDFU4CDEaD02/yWpD5bI=
-Public Key ID:
-	sha256:3db9adc891d6663094c3a7c22c26808e0b980c553808311a0f4dbfc96a43e5b2
-	sha1:376bdb931c697e924c6bdf7385f8849659814f6b
-
------BEGIN RSA PRIVATE KEY-----
-MIIG5AIBAAKCAYEAufYIYdFLn8Xo8a3c0cUj7s9WEUYKDE6ETmsNFdZee2hKqP2L
-i9bSr+vPjgMfi2UfxX/+i9x6LGqsIUxXVgrKlOf7R8bFg/runUI+4X1mZMJwdBc1
-POhjkdfRbtfOdu1LtztW4Pc2tnyrAtmhcNHUCXNGRfDNpFKtIFe4OTA/4/eP1EAy
-InHNqO2F8UgL8EDUMg9AQd4InVCPYRNlsv9j9qBVMjZiX7hoBC8k1laNkd4TIdV6
-zet3+M5Fp/W9lvxFI1yPXw/xWM7K9R3nepunKniuGmjBsac/ZHCUFqJaHz5KpXyM
-pSH1GTXOnIKFOldK4NYOzjCOR9Z+k63oJPZ+c7R9cKAZ7DERhS8X6MiykQ2shDY6
-8i7HSZd9Dy5oLlH63evbi/tWJSG9mE/UamYuzORKR4PNwixaKQbteiDU59wKazH5
-yQNGIqMSGkNgSsj9QW2NPkyNskuzCP04f77V/wSpum5PIygyuLidge9A+Vuxeb5v
-7XBS8Zp3Wn78JYrlAgMBAAECggGBAK4I+fNBwvq2Z7m3M1AGpghbdnsYB1NZMC2L
-tmVXiHkKM8VP9Idc9zS5Bjgr6Bu2+jMGBJ20K4riElHfdmUKGGmfaeXUuwk3kJUQ
-aHTzvR5TcpbTGXn1KypUxqZrxcg7cH79Q+OquUO0DP/P2W0SktR9U6klIe/FiE0a
-i0jKRSD+kVbc9Y6S3xxXnuEewj2JDo4DA+og+ALyYB1D4AvTRCSODO2/Q/W9SWuR
-C3Kk8j0vjsw9VH7e/hqWQU5dh5+EWzySjKdz5ABqEwJE162JMVDu0uyvbkfkm1k9
-k1jVcR5k96xohcqG92olsP9Wd6/0UENJCyIxa3lv8nTffBvhTRLnuh5lOK0nODtQ
-bdDmNg65JSfYMeQuvgG02P5w0hL/u3s/9NxRgxczjiZo0Yk+5WcAcuAPkoO6YlXb
-roR9Xsx/ctDc84ieIgd4muFO4zQwFFb7gJPyvsPNcBv+sNpBPCifqA4ceRtSmqio
-zw4W+cDbmenfSsNmfE+hJ+vwBl5NQQKBwQD3QauloSM35r7+hemWMBvEM1DIhV5E
-RlEdPSiKIVgtO4IR3LwNdsUgRaI0ycuFO952BrzBn005w2OtXQ3+vKs/LHZnKdml
-PTivown/CezpFYUE5nCHLu6geCZzoHRgGK33jBrzTAdTubidptE/i6MThxagQBE2
-m/Qesbq5ADQV0ikN6JD3xdzBk9PlbmwTJA8Ryw036vn5iY6RcU8dWxf4qpSNQ7+s
-3dbsPLxw0VETdnfvmpFtTVky5peT2LsUYP0CgcEAwIl5qHOGIMfpDTVWpNCoNyF2
-Jekvn8DmRfYnVFZK3Q7FQ+TsxSCXFlv874ZXsebOi+lY1KTDoG32V22KCevR3mNC
-gXafTED3SNOZGyN9645Se+iUlPPVSUlu2jjC9rYOJ3r5TStsqqDex7F4Bu58X34z
-bQVEm5rKkBJhpJZGm2bRi0zp8SEvbCaqT1Y91wOMvzMkpQH1h6Oy2SuCK0LEWl1A
-hNLYfSlvaSGiC8p8RjS3jykRL2I+h6BiUDQhiUoJAoHBAMuyL12RRbldAIYg/lH7
-qjRV7jx0Gzf2EgcbhlVdqQ4Ck2Jxzf7tlPLESyBgCqnlq5ziagi9W1q2DF0bZ1cw
-SYgO8jCFOse1iwivMaIJpEJVtzNVQOktketjcJIbYyRz0IY6x00emn6wZ1aBwqsu
-N5fz14EHpuatTk0nMGQOtdowPCA4M43cVMSpK409Dg4qy7tl46roiy231Fsf1QSj
-MjlrFlzWrocUb2ZJlxj+aGO3WpFrbll0uoKDk+Z6S407ZQKBwBd2KR7/xM5lzd5Q
-K5i13GmraCxCeA0tgmHwFubOBR1e2WbmlHuI9yBAYVgGtNT23SBrdOmkkjoQbD5H
-GNUQqWhCDC6ed9bg68EyF6wY7RUxKJf0xXZJKCpgCmQJGqjZkmv5LjvbGMjKBZur
-4oZltT4lsLqOM8gKWrinpMJblYsGQm6JFtDNTGwPYh180thKlHIQF10MGhFHP1n7
-VUdUQX0Jc/07fCn0TKEw+gAZ0n7zmZKWXIO7owb/4jsHvzZtkQKBwAt9Mb+1iQrI
-LChMQZjub1XladOyHGbE2h15LYsDKDCjyW9+lKJyds4aMifG+Xiu19DYr6F2VP8r
-l6Rdter2pbMIoZxGfH2AODKp5Al9sOQf4ujg74T0B45MvAJyrUPmx1rnd9GBJ46m
-uyPdFGnLCAJol7j/f8BPQ4bR2I5+mq4dxe6uGQPZy/ExtXtybMv40cEHmuUJjyp6
-kkvpHqB9qq69h2C+d7er3slUE+lqPILLlOJMvDU2EtYP4XdY/whOOA==
------END RSA PRIVATE KEY-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/ldap-server_ldap.cert.pem b/roles/mail_server/molecule/default/tests/data/x509/ldap-server_ldap.cert.pem
deleted file mode 100644
index 8dea291608fb129c61a7f2079e71860d272416c5..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/ldap-server_ldap.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEJDCCAoygAwIBAgIMWVIdaS9ZbFWnhzweMA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI3MDg1NTA1WhcNMjcwNjI1MDg1
-NTA1WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBMREFQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALf2/pDGjImrdYxtnFCQMzBpS7kpqDybB2ThvdWf3zgfVDdZ
-4fMt9l0/9YnUwjbEaG4/xhzTS5CUvvkSVssgtkv3h59Q9DeC77LL+CxUWAPTsqEf
-KGtVS4MvMrHi95h17lPdQQIu1mhE7lSJddRx4kMiPNm0mdRcfRtUUNuUW4PORQ7x
-7RcP8Tw39CTIJiaA1EK4PjxY4ZkGoopD4ShxpGdc/37hqosepU3Kexm/3hhacPOJ
-AVZjCdwvc4vwk0yKY5cX4KV9Su4SWLzctmZRPIpyBwlMT7pwU/FQZANgE3IjKziK
-kAjRCjC8daghq2IPSD1wYNXaUuV7K8yMAKkoBUkCAwEAAaOBjzCBjDAMBgNVHRMB
-Af8EAjAAMBYGA1UdEQQPMA2CC2xkYXAtc2VydmVyMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFKOBucctLQCRMaZNo+XT4dRL
-MOzpMB8GA1UdIwQYMBaAFDdr25McaX6STGvfc4X4hJZZgU9rMA0GCSqGSIb3DQEB
-CwUAA4IBgQBSV2tOZjFJNKuBiHvGBbtIWGGzXADbn5CsOMOcjC6T3nCY06H6WaEF
-znaiH2CY/GkHIk8GT86QcmEaGFuLimG80oszfFBh2C/m/H+U4uN914+Qvj9GedX1
-NpzgBzZuPCOqcov0omLz4CUCr+2bEnk3TRtvHbtl22VEIAIYFfAgXe8mD4eD5qV5
-bBrk2rgImEZicM/8FvnvLIREeWvlmzXo9dkixZflFRNUIulXEuiWG8gxv8Aqwb++
-UFU4pg/kx0cgsBdXkwtz0a8WXUvs+SfrmF7xX3my7PqfKdW/h57LcTAdQ5cbUvZ+
-Ob3UqZJJmnc/7UPa2bxbQXORJTjWZT0uI8hMcqq0Es0RKBgNo8gYwu7qcY/G1BZ6
-7DTD8tVenTE2661ubj7X0uIP0nt+HMBt0yDhPibuhgEtUjAi0ManTpM1Y6ZcQRYD
-YJVyjcmzsTIjmcJY/FBOvnefhvoI9dOLwkjjpp7gd8HGI4ajyjvJ//c8uPPwgyZ/
-3XDuA5ZWtSk=
------END CERTIFICATE-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/ldap-server_ldap.key.pem b/roles/mail_server/molecule/default/tests/data/x509/ldap-server_ldap.key.pem
deleted file mode 100644
index 263d416f37d57863093d46218bcb23dd5ecc6f97..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/ldap-server_ldap.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:b7:f6:fe:90:c6:8c:89:ab:75:8c:6d:9c:50:90:33
-	30:69:4b:b9:29:a8:3c:9b:07:64:e1:bd:d5:9f:df:38
-	1f:54:37:59:e1:f3:2d:f6:5d:3f:f5:89:d4:c2:36:c4
-	68:6e:3f:c6:1c:d3:4b:90:94:be:f9:12:56:cb:20:b6
-	4b:f7:87:9f:50:f4:37:82:ef:b2:cb:f8:2c:54:58:03
-	d3:b2:a1:1f:28:6b:55:4b:83:2f:32:b1:e2:f7:98:75
-	ee:53:dd:41:02:2e:d6:68:44:ee:54:89:75:d4:71:e2
-	43:22:3c:d9:b4:99:d4:5c:7d:1b:54:50:db:94:5b:83
-	ce:45:0e:f1:ed:17:0f:f1:3c:37:f4:24:c8:26:26:80
-	d4:42:b8:3e:3c:58:e1:99:06:a2:8a:43:e1:28:71:a4
-	67:5c:ff:7e:e1:aa:8b:1e:a5:4d:ca:7b:19:bf:de:18
-	5a:70:f3:89:01:56:63:09:dc:2f:73:8b:f0:93:4c:8a
-	63:97:17:e0:a5:7d:4a:ee:12:58:bc:dc:b6:66:51:3c
-	8a:72:07:09:4c:4f:ba:70:53:f1:50:64:03:60:13:72
-	23:2b:38:8a:90:08:d1:0a:30:bc:75:a8:21:ab:62:0f
-	48:3d:70:60:d5:da:52:e5:7b:2b:cc:8c:00:a9:28:05
-	49:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	5b:c4:86:30:4a:1b:09:01:d2:dd:7e:40:1f:a0:0f:28
-	f3:1d:a6:fc:34:c4:26:c1:85:7d:66:69:0e:1b:17:af
-	e9:1e:c3:63:87:1f:42:6a:39:e1:8e:23:e7:cd:d2:24
-	15:fb:12:24:86:f2:86:e8:ec:6a:ea:cf:08:fd:04:72
-	d8:c3:7a:a1:b3:71:8d:8b:6c:b1:7a:d7:02:2b:f5:9c
-	c0:da:c6:e4:2e:c6:99:a8:92:fe:c2:e5:e9:84:d0:2f
-	56:fe:63:d3:66:f1:e5:89:9d:29:e6:78:34:c5:aa:8c
-	ba:a3:88:26:23:26:60:0c:b8:79:52:ec:76:11:40:a9
-	e7:7f:bc:43:b3:99:80:be:17:6e:47:df:3b:59:29:7a
-	d0:3b:89:f8:8e:44:ff:e5:f1:d4:fc:50:26:be:17:2c
-	a6:5b:fd:95:11:34:36:18:e2:ff:5b:96:3e:cf:88:f1
-	fb:9f:cb:8f:3d:59:d8:d1:4e:39:9e:1f:76:d6:8a:31
-	a6:56:04:de:01:3e:a1:9e:92:4a:74:63:90:da:07:1e
-	61:ec:07:34:6a:b3:6a:b8:f1:90:7c:f2:57:b9:fa:94
-	7b:cc:2b:2e:1c:1c:68:33:ea:d0:d2:36:23:1e:52:f3
-	5e:54:5c:dd:69:6d:b3:83:3a:b1:0e:da:92:9e:93:41
-	
-
-prime1:
-	00:ea:10:f1:bb:3c:a9:d1:07:b0:6b:6e:e6:b4:73:f8
-	a3:56:49:43:56:4b:93:21:58:ac:bd:7d:d1:40:15:44
-	c7:a5:be:8f:c1:73:bb:6c:80:6f:84:5a:02:a5:5e:92
-	b3:ce:cc:2e:16:8a:29:c7:d2:e0:e9:0b:c1:c5:8a:1c
-	b9:c4:ce:8f:df:58:4f:c2:5d:44:53:05:40:eb:dc:80
-	17:79:3d:55:ad:a5:9b:c0:a9:6e:f1:9a:2c:71:15:73
-	8f:01:fd:4b:71:ec:b5:7b:5e:7e:d2:f7:a8:53:e8:ab
-	ec:f8:c4:2b:3a:12:87:fc:a7:73:0d:9f:e2:91:a9:25
-	6d:
-
-prime2:
-	00:c9:34:28:d3:1a:69:b9:a8:74:04:60:b3:d8:2e:98
-	32:79:ee:4a:14:e0:a0:d4:3f:08:7a:00:a0:68:0b:b3
-	e4:44:e3:bf:ea:11:16:bd:b9:8c:5d:01:81:24:a9:ff
-	5b:dc:9e:83:4c:b4:89:05:0e:cb:b6:f9:e4:e7:f5:fa
-	34:e3:cc:60:2f:3f:29:71:74:16:00:bb:b0:f3:49:4a
-	b6:9e:df:7e:4e:1e:7c:1c:4a:48:a9:a9:45:ef:8d:af
-	48:27:58:d2:b9:31:9b:4a:08:bf:f6:98:3d:09:01:e0
-	42:0b:22:95:81:2b:67:d4:1d:90:2e:43:22:7f:2a:21
-	cd:
-
-coefficient:
-	00:c8:92:b0:f4:93:ba:ba:0b:4d:a0:01:30:aa:09:b1
-	3f:6b:2d:a1:ed:48:8e:fe:d7:14:62:4c:7b:d8:d2:b9
-	2d:3b:80:c5:2c:25:94:c0:7c:d0:7c:0d:48:aa:39:48
-	6c:ba:3f:e3:23:65:af:43:0e:65:76:b8:7e:b2:7f:e1
-	52:29:9b:49:bb:7a:18:80:43:40:a7:d4:79:0b:d5:c8
-	b3:c9:95:ac:72:2f:3f:d2:87:5f:e1:90:e2:4d:e3:c5
-	dc:a9:69:7b:f3:54:cc:6d:38:c0:5f:29:fc:fc:ce:2e
-	a0:30:ba:5c:73:3c:10:4e:d9:27:b2:35:79:37:ac:75
-	19:
-
-exp1:
-	25:e7:8a:8d:ec:bb:ff:5a:c4:6a:11:72:90:e4:7a:ee
-	50:89:da:ba:bd:d0:5c:c5:14:6c:37:54:cc:90:e5:2b
-	83:9e:c1:7e:ed:73:fb:95:2c:f9:fc:ed:92:c4:26:f3
-	b1:58:85:5a:27:13:af:05:6a:60:b3:03:b5:2e:b1:8a
-	2f:e1:d7:90:ae:a7:73:ed:50:a4:35:24:97:4d:84:fc
-	c8:28:73:98:84:4a:1d:c0:12:74:53:a8:40:c3:dd:8b
-	da:21:9f:b7:1a:43:25:70:5f:0f:61:05:c4:58:d8:86
-	ae:9e:6d:f5:a0:8c:9f:10:aa:e4:18:f1:42:ef:66:5d
-	
-
-exp2:
-	00:bb:3d:b4:24:48:b7:4d:14:8b:eb:2b:07:12:ce:c1
-	ca:6f:98:27:0e:e8:c0:22:e5:0a:01:67:a5:df:4d:cc
-	ba:48:b5:dd:fa:78:ae:be:1e:f7:95:f1:f9:79:e2:4e
-	06:f1:f7:fd:de:9b:3f:cc:1a:29:d0:7d:1b:de:16:16
-	23:b4:3e:94:e0:43:1a:51:3f:a3:de:48:cc:f2:8b:29
-	61:6b:d6:36:d7:82:1d:23:c2:a9:7e:62:4d:f8:11:d5
-	a6:03:1f:f0:f2:71:4c:bf:88:07:04:f8:46:0c:a4:d7
-	4a:fe:cb:cf:6f:e6:b1:f8:3f:0e:d7:4e:98:c2:d8:b5
-	9d:
-
-
-Public Key PIN:
-	pin-sha256:WjLH/W6cJM/BtbWZYQxkam+GXvyZCVqiv57MYnFau4M=
-Public Key ID:
-	sha256:5a32c7fd6e9c24cfc1b5b599610c646a6f865efc99095aa2bf9ecc62715abb83
-	sha1:a381b9c72d2d009131a64da3e5d3e1d44b30ece9
-
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAt/b+kMaMiat1jG2cUJAzMGlLuSmoPJsHZOG91Z/fOB9UN1nh
-8y32XT/1idTCNsRobj/GHNNLkJS++RJWyyC2S/eHn1D0N4Lvssv4LFRYA9OyoR8o
-a1VLgy8yseL3mHXuU91BAi7WaETuVIl11HHiQyI82bSZ1Fx9G1RQ25Rbg85FDvHt
-Fw/xPDf0JMgmJoDUQrg+PFjhmQaiikPhKHGkZ1z/fuGqix6lTcp7Gb/eGFpw84kB
-VmMJ3C9zi/CTTIpjlxfgpX1K7hJYvNy2ZlE8inIHCUxPunBT8VBkA2ATciMrOIqQ
-CNEKMLx1qCGrYg9IPXBg1dpS5XsrzIwAqSgFSQIDAQABAoIBAFvEhjBKGwkB0t1+
-QB+gDyjzHab8NMQmwYV9ZmkOGxev6R7DY4cfQmo54Y4j583SJBX7EiSG8obo7Grq
-zwj9BHLYw3qhs3GNi2yxetcCK/WcwNrG5C7GmaiS/sLl6YTQL1b+Y9Nm8eWJnSnm
-eDTFqoy6o4gmIyZgDLh5Uux2EUCp53+8Q7OZgL4XbkffO1kpetA7ifiORP/l8dT8
-UCa+FyymW/2VETQ2GOL/W5Y+z4jx+5/Ljz1Z2NFOOZ4fdtaKMaZWBN4BPqGekkp0
-Y5DaBx5h7Ac0arNquPGQfPJXufqUe8wrLhwcaDPq0NI2Ix5S815UXN1pbbODOrEO
-2pKek0ECgYEA6hDxuzyp0Qewa27mtHP4o1ZJQ1ZLkyFYrL190UAVRMelvo/Bc7ts
-gG+EWgKlXpKzzswuFoopx9Lg6QvBxYocucTOj99YT8JdRFMFQOvcgBd5PVWtpZvA
-qW7xmixxFXOPAf1Lcey1e15+0veoU+ir7PjEKzoSh/yncw2f4pGpJW0CgYEAyTQo
-0xppuah0BGCz2C6YMnnuShTgoNQ/CHoAoGgLs+RE47/qERa9uYxdAYEkqf9b3J6D
-TLSJBQ7Ltvnk5/X6NOPMYC8/KXF0FgC7sPNJSrae335OHnwcSkipqUXvja9IJ1jS
-uTGbSgi/9pg9CQHgQgsilYErZ9QdkC5DIn8qIc0CgYAl54qN7Lv/WsRqEXKQ5Hru
-UInaur3QXMUUbDdUzJDlK4OewX7tc/uVLPn87ZLEJvOxWIVaJxOvBWpgswO1LrGK
-L+HXkK6nc+1QpDUkl02E/Mgoc5iESh3AEnRTqEDD3YvaIZ+3GkMlcF8PYQXEWNiG
-rp5t9aCMnxCq5BjxQu9mXQKBgQC7PbQkSLdNFIvrKwcSzsHKb5gnDujAIuUKAWel
-303Muki13fp4rr4e95Xx+XniTgbx9/3emz/MGinQfRveFhYjtD6U4EMaUT+j3kjM
-8ospYWvWNteCHSPCqX5iTfgR1aYDH/DycUy/iAcE+EYMpNdK/svPb+ax+D8O106Y
-wti1nQKBgQDIkrD0k7q6C02gATCqCbE/ay2h7UiO/tcUYkx72NK5LTuAxSwllMB8
-0HwNSKo5SGy6P+MjZa9DDmV2uH6yf+FSKZtJu3oYgENAp9R5C9XIs8mVrHIvP9KH
-X+GQ4k3jxdypaXvzVMxtOMBfKfz8zi6gMLpcczwQTtknsjV5N6x1GQ==
------END RSA PRIVATE KEY-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_imap.cert.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_imap.cert.pem
deleted file mode 100644
index b69788b15aa5252c365f660fe1ccbe81ad5b3430..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_imap.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIELTCCApWgAwIBAgIMWVJZ2QR+xX2Hq+DLMA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI3MTMxMjU3WhcNMjcwNjI1MTMx
-MjU3WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBJTUFQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMmy6RGVST0UOwVplP2gQYBOnMnZoQlQTcwGMsrJ96P1Z1T5
-HY6hUKJefKLkcdvTB6vPfyFcVK9esfZHS7jmQ3exMoSor+orhgukFXyOVkPoEl64
-p7USQtzgxpz/MOy/53mub1fQi5ys/FWmntby48ox/et+Nqya8Ih6DL8sOk7eHSe6
-6I9UafA0PWs9bv66Jb/gHdR7e28ftV0nJBV/qoq2zkpKAqXfxMhNSPy+SAcNKPPK
-FsgO3Oo0mqHt2+Ca+UtOEH2Cpjli+0TqiB/L1wUqX1fym2cHamDre10ITKJo7NK5
-uXN/SxvbX5wXbHv7hI3P1wy0tQNFq/veczeUllMCAwEAAaOBmDCBlTAMBgNVHRMB
-Af8EAjAAMB8GA1UdEQQYMBaCFHBhcmFtZXRlcnMtbWFuZGF0b3J5MBMGA1UdJQQM
-MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFIUPEXIWjXo9
-CSKkAjGlkzO3xnQXMB8GA1UdIwQYMBaAFDdr25McaX6STGvfc4X4hJZZgU9rMA0G
-CSqGSIb3DQEBCwUAA4IBgQBbtodQhsPdOeTc0iV/4rbo6C52Z/NjR/0HBogBzQZ5
-2MWph9Pm5FQWr3bgka73p7IWdPl4IvOs+7OvrszTKVmyLJUWqWB9RIpNrYFDLqbM
-fP6Nn9AFsVgI0DVchih4lIUJ+BhZ42woWL4UlwtZTEsohrH2k22B0SbWxJQSIA+I
-MRD3vW5+LdaME7OJTXSeZl0tLvecUIQTNbOK2nWOT4ByVToJ+Gj0bOzfvn5qwhZh
-cgteNZy8+6Bh+V8m8VIC3Q7wzRt4OF9NT14S950iNJEgMpT3/k4IBLuO6OxPiKyi
-e4Uj3/Zog/Y0hGU7/PkhsZYrc/kAlInys57oDFxgbkw9U9a3RpV8/NH8M2NqxMp2
-qJoGqy5DN99XWUxdk4y7yGJ870932OWH9nxCARxH3dIdMPeIQjZTSgciRuXt8Sta
-iDCNTZpWRftTFeYcK/BXsF10JuqXARr13RC6DGVyfjCHY41kyezCgqSLcygZ1LS6
-GllzMGF/zwIyrnMWZf6VKvs=
------END CERTIFICATE-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_imap.key.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_imap.key.pem
deleted file mode 100644
index d013c31960188b1e10acf8c335024ade7fb352dd..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_imap.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:c9:b2:e9:11:95:49:3d:14:3b:05:69:94:fd:a0:41
-	80:4e:9c:c9:d9:a1:09:50:4d:cc:06:32:ca:c9:f7:a3
-	f5:67:54:f9:1d:8e:a1:50:a2:5e:7c:a2:e4:71:db:d3
-	07:ab:cf:7f:21:5c:54:af:5e:b1:f6:47:4b:b8:e6:43
-	77:b1:32:84:a8:af:ea:2b:86:0b:a4:15:7c:8e:56:43
-	e8:12:5e:b8:a7:b5:12:42:dc:e0:c6:9c:ff:30:ec:bf
-	e7:79:ae:6f:57:d0:8b:9c:ac:fc:55:a6:9e:d6:f2:e3
-	ca:31:fd:eb:7e:36:ac:9a:f0:88:7a:0c:bf:2c:3a:4e
-	de:1d:27:ba:e8:8f:54:69:f0:34:3d:6b:3d:6e:fe:ba
-	25:bf:e0:1d:d4:7b:7b:6f:1f:b5:5d:27:24:15:7f:aa
-	8a:b6:ce:4a:4a:02:a5:df:c4:c8:4d:48:fc:be:48:07
-	0d:28:f3:ca:16:c8:0e:dc:ea:34:9a:a1:ed:db:e0:9a
-	f9:4b:4e:10:7d:82:a6:39:62:fb:44:ea:88:1f:cb:d7
-	05:2a:5f:57:f2:9b:67:07:6a:60:eb:7b:5d:08:4c:a2
-	68:ec:d2:b9:b9:73:7f:4b:1b:db:5f:9c:17:6c:7b:fb
-	84:8d:cf:d7:0c:b4:b5:03:45:ab:fb:de:73:37:94:96
-	53:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	37:c9:01:e9:59:0e:ce:93:df:d7:19:62:99:db:4f:02
-	7b:bb:a5:a0:49:87:d7:ec:0c:77:d2:68:7f:ff:bc:1b
-	4d:9f:14:df:75:e9:6b:f1:dc:8c:40:49:4a:ac:6f:eb
-	79:3b:84:7f:e7:97:8c:81:76:5b:15:50:fe:2c:c1:90
-	43:34:23:b8:bc:1e:da:36:d2:d5:69:13:f0:12:2f:e9
-	e9:da:c4:db:ad:9b:05:5f:2d:d4:00:ec:1b:cd:ff:2d
-	b8:5b:e4:73:b7:3c:45:f3:1a:3f:5e:3c:24:5b:3d:61
-	58:fe:4f:b9:b2:c9:7e:78:f4:66:3d:4c:4a:a1:3d:da
-	77:0d:ae:cb:cf:44:af:0b:54:64:80:9b:2e:c2:cf:88
-	eb:91:a4:b4:2e:83:cd:6d:2b:81:2f:da:f2:21:eb:e2
-	9d:7f:a5:ce:88:20:01:c5:e4:62:e0:05:ac:ce:dc:61
-	70:bf:a1:c5:32:9b:03:c7:b0:d4:0c:60:0e:f7:7e:47
-	86:18:0a:ed:e5:73:3a:89:a0:31:b1:80:3d:c5:1c:16
-	77:d9:22:9a:a9:e0:f9:ec:0a:0b:ba:24:8f:55:f0:9d
-	27:5c:c0:e5:60:83:a8:6d:7b:78:28:08:e7:69:57:32
-	ec:23:f6:96:34:5e:b2:96:37:26:ed:e9:bd:48:b5:b1
-	
-
-prime1:
-	00:ec:85:af:6d:40:e2:12:29:f4:df:3a:74:43:95:8d
-	06:fe:29:0f:ed:f2:e0:e0:f1:76:2d:f2:6f:23:d5:cc
-	b7:04:48:d6:0a:51:7d:22:77:be:e2:8e:25:a3:0e:89
-	67:6c:bf:b3:a1:e8:5f:9a:03:55:94:d5:e9:88:c2:cb
-	bb:6e:ec:f3:cd:62:23:a1:92:5c:ff:a6:9d:a5:74:46
-	d7:18:04:11:49:50:09:f0:63:cb:e3:61:fa:7e:e9:57
-	65:4e:a3:da:4e:7c:bc:37:61:a2:ba:8d:5c:8c:e6:2b
-	dd:32:19:86:5f:c3:fc:67:dd:e4:f1:5b:57:32:d8:62
-	8d:
-
-prime2:
-	00:da:4f:16:1c:0e:be:4b:3b:90:68:fe:b5:76:59:77
-	86:9a:b2:c9:02:5e:1e:f2:d6:95:87:92:16:ad:85:2c
-	7c:89:63:ef:5f:ab:14:17:b1:1c:d6:fe:66:0d:1f:34
-	5f:04:87:35:e2:27:ae:b8:1d:a2:0a:aa:a7:f0:5f:4b
-	cb:98:fd:21:ea:1c:b5:8c:df:11:fa:8e:99:e6:7a:c9
-	f3:51:c6:a9:e5:15:fb:80:16:d3:10:92:0d:03:52:66
-	f6:83:02:d5:1b:1e:67:e2:23:69:db:0b:44:d6:92:2f
-	db:bc:ab:af:21:54:df:09:8d:ff:be:8a:ab:8d:29:14
-	5f:
-
-coefficient:
-	00:9b:e2:8e:52:9e:7e:59:69:e5:81:55:bb:56:27:6e
-	a0:dd:10:91:0c:9a:6a:a9:a8:08:73:b7:53:55:cc:61
-	79:03:4a:b7:de:38:75:f5:33:7f:51:5f:4d:59:bd:6d
-	51:5a:a5:a8:76:7f:c4:ad:25:ca:c1:78:dc:c3:6f:7e
-	53:1d:3d:fb:bd:6d:13:e5:a4:9a:65:77:ff:78:86:1d
-	71:92:61:5e:38:1f:dd:95:8b:22:51:eb:83:08:a7:bf
-	a8:d7:45:f5:c9:57:2d:67:d7:02:32:1d:12:0d:8c:7c
-	7f:f9:aa:15:9d:e3:68:9a:a9:61:e4:ca:b1:74:a5:d3
-	50:
-
-exp1:
-	65:0a:73:37:cc:19:07:c3:6e:bd:92:3e:2a:c5:0f:9b
-	26:26:aa:8c:6f:4e:8c:29:fa:df:84:0a:e0:97:2c:3e
-	1f:11:72:86:b3:eb:2e:37:53:8f:7b:44:2e:d5:3d:f3
-	b5:ec:6b:33:c6:8e:58:c0:05:e6:70:3f:b4:d1:ea:b0
-	e6:a1:49:41:bb:24:17:98:ec:2b:b6:a4:f0:12:ad:54
-	a4:08:d0:cd:ad:e8:a1:0e:31:02:b1:4f:8e:b9:e6:40
-	fc:08:59:71:60:2e:13:c6:9c:fa:ee:fa:d3:a2:5c:a8
-	c1:07:50:75:46:c7:64:23:d1:f3:1d:9f:31:b4:68:dd
-	
-
-exp2:
-	58:68:26:9f:fe:28:79:f7:09:28:3b:dd:e8:ab:9a:87
-	dc:26:02:d8:fe:9c:b1:e2:cc:73:36:6a:10:a3:19:bc
-	e5:36:9f:3d:b2:de:54:29:d9:70:07:5d:f4:7a:6a:8f
-	00:1a:71:6b:c0:7e:34:f9:6b:21:be:b2:7b:d9:5b:ac
-	7b:ac:27:0b:d3:cc:81:db:e4:3f:ff:77:bb:aa:86:16
-	0f:4b:d0:89:81:39:74:49:c9:f7:af:ed:ad:26:b5:a3
-	a6:b2:82:f2:94:81:a5:46:8a:1b:b6:98:8d:fc:6d:7d
-	23:0e:b3:c1:5f:c9:62:e9:2a:64:53:6b:dd:a2:81:29
-	
-
-
-Public Key PIN:
-	pin-sha256:2PjOFPCxYKICX+oXYybOdi+6YKWqBAMLezAmMVSPnxw=
-Public Key ID:
-	sha256:d8f8ce14f0b160a2025fea176326ce762fba60a5aa04030b7b302631548f9f1c
-	sha1:850f1172168d7a3d0922a40231a59333b7c67417
-
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAybLpEZVJPRQ7BWmU/aBBgE6cydmhCVBNzAYyysn3o/VnVPkd
-jqFQol58ouRx29MHq89/IVxUr16x9kdLuOZDd7EyhKiv6iuGC6QVfI5WQ+gSXrin
-tRJC3ODGnP8w7L/nea5vV9CLnKz8Vaae1vLjyjH96342rJrwiHoMvyw6Tt4dJ7ro
-j1Rp8DQ9az1u/rolv+Ad1Ht7bx+1XSckFX+qirbOSkoCpd/EyE1I/L5IBw0o88oW
-yA7c6jSaoe3b4Jr5S04QfYKmOWL7ROqIH8vXBSpfV/KbZwdqYOt7XQhMomjs0rm5
-c39LG9tfnBdse/uEjc/XDLS1A0Wr+95zN5SWUwIDAQABAoIBADfJAelZDs6T39cZ
-YpnbTwJ7u6WgSYfX7Ax30mh//7wbTZ8U33Xpa/HcjEBJSqxv63k7hH/nl4yBdlsV
-UP4swZBDNCO4vB7aNtLVaRPwEi/p6drE262bBV8t1ADsG83/Lbhb5HO3PEXzGj9e
-PCRbPWFY/k+5ssl+ePRmPUxKoT3adw2uy89ErwtUZICbLsLPiOuRpLQug81tK4Ev
-2vIh6+Kdf6XOiCABxeRi4AWsztxhcL+hxTKbA8ew1AxgDvd+R4YYCu3lczqJoDGx
-gD3FHBZ32SKaqeD57AoLuiSPVfCdJ1zA5WCDqG17eCgI52lXMuwj9pY0XrKWNybt
-6b1ItbECgYEA7IWvbUDiEin03zp0Q5WNBv4pD+3y4ODxdi3ybyPVzLcESNYKUX0i
-d77ijiWjDolnbL+zoehfmgNVlNXpiMLLu27s881iI6GSXP+mnaV0RtcYBBFJUAnw
-Y8vjYfp+6VdlTqPaTny8N2Giuo1cjOYr3TIZhl/D/Gfd5PFbVzLYYo0CgYEA2k8W
-HA6+SzuQaP61dll3hpqyyQJeHvLWlYeSFq2FLHyJY+9fqxQXsRzW/mYNHzRfBIc1
-4ieuuB2iCqqn8F9Ly5j9IeoctYzfEfqOmeZ6yfNRxqnlFfuAFtMQkg0DUmb2gwLV
-Gx5n4iNp2wtE1pIv27yrryFU3wmN/76Kq40pFF8CgYBlCnM3zBkHw269kj4qxQ+b
-JiaqjG9OjCn634QK4JcsPh8Rcoaz6y43U497RC7VPfO17Gszxo5YwAXmcD+00eqw
-5qFJQbskF5jsK7ak8BKtVKQI0M2t6KEOMQKxT4655kD8CFlxYC4Txpz67vrTolyo
-wQdQdUbHZCPR8x2fMbRo3QKBgFhoJp/+KHn3CSg73eirmofcJgLY/pyx4sxzNmoQ
-oxm85TafPbLeVCnZcAdd9HpqjwAacWvAfjT5ayG+snvZW6x7rCcL08yB2+Q//3e7
-qoYWD0vQiYE5dEnJ96/trSa1o6aygvKUgaVGihu2mI38bX0jDrPBX8li6SpkU2vd
-ooEpAoGBAJvijlKefllp5YFVu1YnbqDdEJEMmmqpqAhzt1NVzGF5A0q33jh19TN/
-UV9NWb1tUVqlqHZ/xK0lysF43MNvflMdPfu9bRPlpJpld/94hh1xkmFeOB/dlYsi
-UeuDCKe/qNdF9clXLWfXAjIdEg2MfH/5qhWd42iaqWHkyrF0pdNQ
------END RSA PRIVATE KEY-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_smtp.cert.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_smtp.cert.pem
deleted file mode 100644
index 7d2bee3185c840b5293852c81b7e4e1c76e4c66a..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_smtp.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIELTCCApWgAwIBAgIMWVJZ1zrNkvcjfectMA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI3MTMxMjU1WhcNMjcwNjI1MTMx
-MjU1WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBTTVRQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAPOyzfEatL13DJif7PNgs8U5BNniVlMsuZtS6ehf2ensmaQ1
-KRFTyB3LkxpjEskCtU3Trb1J59NoUA5RKwIVJ5ac5uLxHtdZzk6aUfKiiAZqpLwk
-bX3qAsMGp4umWlvtGnOYoYTqSqXpioeO3xPzR136NUevoMdtIoF0OwrPVTyZy53+
-sQakdY0cIRqy1KALyZETgsGKMrlsGgGNksRUdl8exUn6sakAUp7Ml2WK8QhM9ugJ
-7KuC/0fQDDpfiWkWP1mqmYNqebVVQvGSl+51IUha9WkJudwILiwTmUp8TbPGRo2n
-jkcrdpHcw1oLFai1YejDgqejWloCKkzTarEr/w8CAwEAAaOBmDCBlTAMBgNVHRMB
-Af8EAjAAMB8GA1UdEQQYMBaCFHBhcmFtZXRlcnMtbWFuZGF0b3J5MBMGA1UdJQQM
-MAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFOK+rZmkYTdF
-BoR0BT+lPp0Lxfl7MB8GA1UdIwQYMBaAFDdr25McaX6STGvfc4X4hJZZgU9rMA0G
-CSqGSIb3DQEBCwUAA4IBgQCV78R7LBQ8skMcNNTFUk5L9mkkExOVuhMrEQz99fj3
-TvUz1F1ZwIF1hRopELnA5lO3DfcgouisZ6wSi7NsP+LnSP3v36F/3fvVUE/afCJ5
-+IbRqfgxS4nnAQi0tqPkrs5afy8CTcArwCCrew4QAGaDdpQsE08hyVgxxOVtg2Eq
-E0aU7iwE2VwdUFgEDdlbG+R09FelFVrMR9R8mzfxCX8cwqgtnZMer8dBLmvdT9jN
-WoGGJvAE7EAbTwiSD6vNfZzUJXhL6YRR2XCRLR2uWMi8r0FfAt+Kkia7HlbxRksX
-wS+YYHTPckBESbx/Im9MChYmP87i8osJGsqZ6sLuYXYE+IcOC92zg8QZup+YZEWc
-nXfxqaoPmFz7YcOybBloy9PYgeQ4KUn9bgtuXZd1dcSA+7yY887uN3HkNRm2z/m/
-8pd7sgKvuEZopKQpDHlfdn5mqG+eB1ZLV2ui9nbfDR6gCU/ZfQ4Bka0Nx+hiQsao
-rIEU5chalXQbXpErjilCtqQ=
------END CERTIFICATE-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_smtp.key.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_smtp.key.pem
deleted file mode 100644
index 1270f4bae5833886ddf6babd528fb1c51904a07c..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_smtp.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:f3:b2:cd:f1:1a:b4:bd:77:0c:98:9f:ec:f3:60:b3
-	c5:39:04:d9:e2:56:53:2c:b9:9b:52:e9:e8:5f:d9:e9
-	ec:99:a4:35:29:11:53:c8:1d:cb:93:1a:63:12:c9:02
-	b5:4d:d3:ad:bd:49:e7:d3:68:50:0e:51:2b:02:15:27
-	96:9c:e6:e2:f1:1e:d7:59:ce:4e:9a:51:f2:a2:88:06
-	6a:a4:bc:24:6d:7d:ea:02:c3:06:a7:8b:a6:5a:5b:ed
-	1a:73:98:a1:84:ea:4a:a5:e9:8a:87:8e:df:13:f3:47
-	5d:fa:35:47:af:a0:c7:6d:22:81:74:3b:0a:cf:55:3c
-	99:cb:9d:fe:b1:06:a4:75:8d:1c:21:1a:b2:d4:a0:0b
-	c9:91:13:82:c1:8a:32:b9:6c:1a:01:8d:92:c4:54:76
-	5f:1e:c5:49:fa:b1:a9:00:52:9e:cc:97:65:8a:f1:08
-	4c:f6:e8:09:ec:ab:82:ff:47:d0:0c:3a:5f:89:69:16
-	3f:59:aa:99:83:6a:79:b5:55:42:f1:92:97:ee:75:21
-	48:5a:f5:69:09:b9:dc:08:2e:2c:13:99:4a:7c:4d:b3
-	c6:46:8d:a7:8e:47:2b:76:91:dc:c3:5a:0b:15:a8:b5
-	61:e8:c3:82:a7:a3:5a:5a:02:2a:4c:d3:6a:b1:2b:ff
-	0f:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	15:35:d2:c6:d1:54:39:c9:4a:c7:5d:e3:f9:aa:c8:fa
-	b9:63:ba:b3:00:60:6c:dc:1a:b0:b4:bb:0c:dc:a2:87
-	7d:37:d5:88:a5:81:6d:41:6a:9e:7b:05:74:75:1a:4f
-	3d:5e:d7:18:4a:7e:6a:e0:01:57:bd:a8:c8:9d:9e:bc
-	75:1b:83:55:09:22:25:26:d7:a0:86:d1:5f:64:07:6a
-	f0:bb:8f:50:18:4d:6d:c0:1b:ac:29:73:69:19:e7:21
-	0e:3e:92:90:46:f4:08:4c:b3:49:e9:1d:71:57:13:37
-	12:b7:e0:6d:60:c8:fa:ae:ae:25:b7:9d:d1:3d:d1:f0
-	45:55:eb:be:e7:dc:46:d1:04:bf:13:d0:f8:70:b2:1d
-	f8:88:24:18:38:d0:ff:82:32:74:fe:27:f0:45:af:43
-	96:5d:ad:46:97:1e:48:c3:fd:1e:e5:d7:76:4e:a7:df
-	5e:09:23:f2:54:6f:64:c8:e6:8c:17:39:e3:25:f1:df
-	b6:36:63:2c:4f:62:7b:33:33:a1:38:85:c7:ea:14:74
-	01:34:2a:b0:51:32:00:8b:ce:d6:e4:77:23:51:80:2b
-	91:ac:0c:36:ca:8e:c9:a0:e3:88:fb:84:6a:6b:57:8c
-	59:a8:ab:51:16:4e:12:98:03:f3:86:64:f7:0c:e3:81
-	
-
-prime1:
-	00:fa:f1:60:8e:3d:77:ed:3c:72:96:3c:67:97:43:aa
-	d6:08:c2:98:20:1a:74:0d:b7:fa:2a:79:45:0c:d5:d5
-	0a:3d:88:18:07:f4:47:91:04:dd:76:08:bd:a1:2d:78
-	52:67:56:6b:bf:be:d6:23:4b:39:e9:9f:8d:16:f4:33
-	4c:cf:d2:98:fa:7c:17:b9:e2:f1:2a:9d:6f:1f:cc:84
-	77:5a:9f:07:cd:4f:61:09:9f:07:dd:1a:24:15:97:46
-	df:f7:3e:5b:ef:0b:52:84:c7:ef:93:b1:9d:67:a2:1d
-	43:a5:5c:4b:22:4c:dc:59:82:ad:94:ad:e7:5e:26:d1
-	37:
-
-prime2:
-	00:f8:9c:0d:95:28:e5:80:2d:ac:c5:02:32:46:43:21
-	75:bf:55:bc:4c:1f:43:80:d5:6d:6e:35:d5:25:d4:1a
-	a1:d2:76:1e:ba:2c:1b:6d:0c:25:05:ff:78:55:34:06
-	8d:81:2f:26:75:13:5f:f7:fa:a4:45:e4:28:82:fa:f1
-	c6:03:49:66:06:1f:a0:57:1b:7b:96:4c:cf:be:81:ff
-	a3:dd:dc:7d:0a:55:8d:3a:42:55:47:f1:0e:5a:d5:dd
-	69:a3:58:01:e3:dd:e2:cf:55:b9:0a:5c:11:7f:5c:51
-	66:60:9e:a5:4f:68:7b:72:c2:b1:b3:03:bd:9a:bf:0c
-	e9:
-
-coefficient:
-	19:df:3c:f9:81:f3:d4:89:ba:df:6f:fa:e5:25:7d:83
-	0a:27:ef:2b:0d:fc:b4:e1:bc:7b:5b:05:d0:4b:75:21
-	cd:00:27:b9:50:b7:25:bc:01:4e:fc:a7:6a:98:ce:26
-	d8:92:7e:53:d7:90:5a:8f:62:78:cb:be:89:a9:76:23
-	76:0e:0d:e9:2a:8e:27:29:34:6f:a2:64:80:17:7f:4d
-	73:14:dc:b2:3e:95:63:9f:4b:cd:2e:14:cd:3c:27:35
-	8a:6d:99:6c:a0:dc:96:b3:f1:57:1e:5c:a8:73:db:28
-	d5:70:b9:dd:a3:d6:05:4b:0d:35:7c:32:ae:7e:fb:cb
-	
-
-exp1:
-	00:cb:eb:2a:13:6c:4f:f0:30:96:cd:0e:f8:ff:2a:b5
-	c0:88:0d:d9:a0:fc:de:21:e7:c7:1a:8c:c1:57:d4:cb
-	f2:2e:5e:51:68:e5:50:e2:bf:99:57:39:73:1f:6e:db
-	bf:da:c9:97:75:91:96:61:c7:d7:9f:c9:4f:d5:bf:4b
-	90:b7:b0:e3:2f:69:77:be:4e:74:bb:b4:83:80:cb:a9
-	39:74:22:97:2c:77:bc:db:1c:a8:3f:3b:e6:e6:c4:af
-	8b:80:56:e4:4e:34:5d:32:19:66:ce:16:1f:5a:ff:99
-	d8:46:9f:e1:4e:56:37:19:65:df:b8:5a:39:11:81:69
-	b1:
-
-exp2:
-	00:c3:e0:90:83:19:79:d9:88:23:3c:06:02:fe:81:1d
-	f7:dc:0c:fd:13:2c:fe:ce:9f:5a:5d:1f:65:15:2d:0c
-	de:bb:27:fe:05:c9:82:c2:64:73:37:4a:95:d0:eb:f0
-	cd:c5:1f:15:39:e1:4e:17:e0:0f:56:51:f1:e9:61:36
-	e5:40:e9:af:cc:db:56:45:cb:8d:90:5a:6c:c4:39:40
-	e6:27:83:f5:b1:12:be:f7:4c:14:4d:5e:8c:64:dd:64
-	5a:3b:2c:b8:30:85:3e:93:05:83:89:ba:08:bf:44:49
-	8e:54:4a:2b:0d:69:d0:fa:16:94:53:eb:7a:94:56:3b
-	21:
-
-
-Public Key PIN:
-	pin-sha256:gfLZ7dVQSW86xMfus3BBtQV9vf0+orcm9y+BsrMxO9g=
-Public Key ID:
-	sha256:81f2d9edd550496f3ac4c7eeb37041b5057dbdfd3ea2b726f72f81b2b3313bd8
-	sha1:e2bead99a4613745068474053fa53e9d0bc5f97b
-
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA87LN8Rq0vXcMmJ/s82CzxTkE2eJWUyy5m1Lp6F/Z6eyZpDUp
-EVPIHcuTGmMSyQK1TdOtvUnn02hQDlErAhUnlpzm4vEe11nOTppR8qKIBmqkvCRt
-feoCwwani6ZaW+0ac5ihhOpKpemKh47fE/NHXfo1R6+gx20igXQ7Cs9VPJnLnf6x
-BqR1jRwhGrLUoAvJkROCwYoyuWwaAY2SxFR2Xx7FSfqxqQBSnsyXZYrxCEz26Ans
-q4L/R9AMOl+JaRY/WaqZg2p5tVVC8ZKX7nUhSFr1aQm53AguLBOZSnxNs8ZGjaeO
-Ryt2kdzDWgsVqLVh6MOCp6NaWgIqTNNqsSv/DwIDAQABAoIBABU10sbRVDnJSsdd
-4/mqyPq5Y7qzAGBs3BqwtLsM3KKHfTfViKWBbUFqnnsFdHUaTz1e1xhKfmrgAVe9
-qMidnrx1G4NVCSIlJteghtFfZAdq8LuPUBhNbcAbrClzaRnnIQ4+kpBG9AhMs0np
-HXFXEzcSt+BtYMj6rq4lt53RPdHwRVXrvufcRtEEvxPQ+HCyHfiIJBg40P+CMnT+
-J/BFr0OWXa1Glx5Iw/0e5dd2TqffXgkj8lRvZMjmjBc54yXx37Y2YyxPYnszM6E4
-hcfqFHQBNCqwUTIAi87W5HcjUYArkawMNsqOyaDjiPuEamtXjFmoq1EWThKYA/OG
-ZPcM44ECgYEA+vFgjj137Txyljxnl0Oq1gjCmCAadA23+ip5RQzV1Qo9iBgH9EeR
-BN12CL2hLXhSZ1Zrv77WI0s56Z+NFvQzTM/SmPp8F7ni8Sqdbx/MhHdanwfNT2EJ
-nwfdGiQVl0bf9z5b7wtShMfvk7GdZ6IdQ6VcSyJM3FmCrZSt514m0TcCgYEA+JwN
-lSjlgC2sxQIyRkMhdb9VvEwfQ4DVbW411SXUGqHSdh66LBttDCUF/3hVNAaNgS8m
-dRNf9/qkReQogvrxxgNJZgYfoFcbe5ZMz76B/6Pd3H0KVY06QlVH8Q5a1d1po1gB
-493iz1W5ClwRf1xRZmCepU9oe3LCsbMDvZq/DOkCgYEAy+sqE2xP8DCWzQ74/yq1
-wIgN2aD83iHnxxqMwVfUy/IuXlFo5VDiv5lXOXMfbtu/2smXdZGWYcfXn8lP1b9L
-kLew4y9pd75OdLu0g4DLqTl0Ipcsd7zbHKg/O+bmxK+LgFbkTjRdMhlmzhYfWv+Z
-2Eaf4U5WNxll37haORGBabECgYEAw+CQgxl52YgjPAYC/oEd99wM/RMs/s6fWl0f
-ZRUtDN67J/4FyYLCZHM3SpXQ6/DNxR8VOeFOF+APVlHx6WE25UDpr8zbVkXLjZBa
-bMQ5QOYng/WxEr73TBRNXoxk3WRaOyy4MIU+kwWDiboIv0RJjlRKKw1p0PoWlFPr
-epRWOyECgYAZ3zz5gfPUibrfb/rlJX2DCifvKw38tOG8e1sF0Et1Ic0AJ7lQtyW8
-AU78p2qYzibYkn5T15Baj2J4y76JqXYjdg4N6SqOJyk0b6JkgBd/TXMU3LI+lWOf
-S80uFM08JzWKbZlsoNyWs/FXHlyoc9so1XC53aPWBUsNNXwyrn77yw==
------END RSA PRIVATE KEY-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_imap.cert.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_imap.cert.pem
deleted file mode 100644
index 84486ef40f3b8cb37c2c8870c390796af56ce7b7..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_imap.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIELDCCApSgAwIBAgIMWVJZ2w+p2lSxJUP7MA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI3MTMxMjU5WhcNMjcwNjI1MTMx
-MjU5WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBJTUFQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMI/m48rGVQinpfuEGudExBTdjtkzWPocvx0xc+PIppw4Ujg
-T2hqUERm9MK7LqbM7dvQUgMDfrxGVYK7jyxUZlcPeiLZ6aWUhfan/Ji4ojEXsva9
-CGjR847NVNgXZ86VF5wMkN9dFk3/aspwcYrUsuW1VY3YVB9bSjfB6Ez5VI72Ok6l
-r7ERjI3cWLB0fSrCFPEzNAhcmUOmtixmOpLHqXb6Fx8EiwhFxVWKGsYsKZOe/fY+
-L+X4e0yofDXjaniO5O27uhoy0xSAa4i9F6Bn0d0t6xYQJs3u0j5f1YmeEGUDWtTk
-bgjz2mbh0EUqF9aIXOySzskfmm9Lf4UG9tgd058CAwEAAaOBlzCBlDAMBgNVHRMB
-Af8EAjAAMB4GA1UdEQQXMBWCE3BhcmFtZXRlcnMtb3B0aW9uYWwwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQU3t4tYmKLhLul
-DqfFnnDy/4ta42AwHwYDVR0jBBgwFoAUN2vbkxxpfpJMa99zhfiEllmBT2swDQYJ
-KoZIhvcNAQELBQADggGBABgk6KhywVmQL9ch6mqYenGCRlE9H2hpZqYXecVUzsER
-HwPw9lsDi7sSL6QW2JP6O13+0KYA0xrM0+o87C6aIVsrnx98JniCV7KB/ic9GTFF
-JCrSqnlLWwivJjbYKx9z0OOnlM/uO9eZYzTHfD/6Ty5Zco/K2/umR6GSN+Aq52iO
-NiKZ/VzZflNIudjZtTmXUHYSEedDto6PZMPkA10Im1t5zDWqLA1XN722yf0w6E/V
-m86q2OuRe8tu5aojxEeWdwM+EiMx0jOCl6v7Og+HPSFGciJZRUf1KJxniAekNRu0
-ORh64vjTolJqUaB6trjaGk4LRLKaRFgJAXj2jExELVIi2ilBp9qqHapKjpzY0s1e
-T4LKXfGE7us6Wbpd7SiP1pxkZv5TF648+6i1II1UvBuYi+Pxo7XFca/KC2opm1XE
-Ez9BB32phoaDXVeqljxPU/HkYYWfCpgbzEtOLv9fJFyW5VQzOOFnlrUemYZbwdYI
-iRLtEJ88CrffkfyksmEb2A==
------END CERTIFICATE-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_imap.key.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_imap.key.pem
deleted file mode 100644
index 6adc421eec49e449b432aee36c18b3953e6a588f..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_imap.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:c2:3f:9b:8f:2b:19:54:22:9e:97:ee:10:6b:9d:13
-	10:53:76:3b:64:cd:63:e8:72:fc:74:c5:cf:8f:22:9a
-	70:e1:48:e0:4f:68:6a:50:44:66:f4:c2:bb:2e:a6:cc
-	ed:db:d0:52:03:03:7e:bc:46:55:82:bb:8f:2c:54:66
-	57:0f:7a:22:d9:e9:a5:94:85:f6:a7:fc:98:b8:a2:31
-	17:b2:f6:bd:08:68:d1:f3:8e:cd:54:d8:17:67:ce:95
-	17:9c:0c:90:df:5d:16:4d:ff:6a:ca:70:71:8a:d4:b2
-	e5:b5:55:8d:d8:54:1f:5b:4a:37:c1:e8:4c:f9:54:8e
-	f6:3a:4e:a5:af:b1:11:8c:8d:dc:58:b0:74:7d:2a:c2
-	14:f1:33:34:08:5c:99:43:a6:b6:2c:66:3a:92:c7:a9
-	76:fa:17:1f:04:8b:08:45:c5:55:8a:1a:c6:2c:29:93
-	9e:fd:f6:3e:2f:e5:f8:7b:4c:a8:7c:35:e3:6a:78:8e
-	e4:ed:bb:ba:1a:32:d3:14:80:6b:88:bd:17:a0:67:d1
-	dd:2d:eb:16:10:26:cd:ee:d2:3e:5f:d5:89:9e:10:65
-	03:5a:d4:e4:6e:08:f3:da:66:e1:d0:45:2a:17:d6:88
-	5c:ec:92:ce:c9:1f:9a:6f:4b:7f:85:06:f6:d8:1d:d3
-	9f:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	5d:92:6a:8b:33:05:c6:83:ce:c5:fd:46:27:b0:c8:c8
-	2a:8c:5f:dc:15:1c:b5:92:fe:8d:f9:e4:1c:5d:5c:ec
-	57:79:d5:a4:2a:f6:5b:a8:37:b8:5c:3d:f3:21:22:c2
-	ca:0a:b6:17:01:8e:01:80:18:1d:1b:e0:c2:47:fd:ec
-	9e:66:05:77:d7:97:8d:ce:62:9d:55:8e:f4:12:1d:77
-	ff:1b:e0:bf:b6:4e:bc:f6:e3:6e:a5:91:d0:cd:b1:00
-	68:89:9d:18:1c:2d:6c:71:47:ae:31:30:60:e2:49:33
-	62:80:ce:0d:91:a8:71:3f:75:50:91:68:d3:0a:aa:ba
-	96:70:02:24:75:b9:3c:3b:b6:6a:58:22:57:63:a7:02
-	83:b0:7c:20:f8:cb:0b:8c:f0:12:bd:ac:53:65:3c:56
-	54:3f:78:29:6f:57:9b:b6:f3:54:48:2b:84:9d:3e:8e
-	d1:55:fb:02:90:d7:1c:2e:13:6d:83:95:2d:a2:af:1c
-	a7:e6:78:de:48:15:e5:5c:d0:27:0d:05:75:c3:b5:52
-	63:19:32:5c:dd:2e:8f:5a:9f:ed:24:cd:a9:f6:b5:31
-	7d:16:74:76:fd:02:68:c2:12:35:7e:ae:93:21:19:8b
-	5d:83:f8:bb:08:04:cf:84:9d:fe:45:b5:7d:2a:4f:c1
-	
-
-prime1:
-	00:f4:0a:66:6e:fd:99:89:9a:31:35:ca:6c:48:31:7e
-	8b:3d:06:7c:76:98:ac:8f:16:69:0b:98:89:64:56:1c
-	be:ee:b0:87:ec:c1:f2:e5:77:57:0d:41:c7:73:c7:91
-	b8:67:39:70:a9:ca:81:f4:e4:7f:a0:58:96:51:18:aa
-	c8:ac:e4:5d:3e:66:3b:8f:1e:be:02:7e:2e:09:b2:86
-	b6:c9:37:c6:3b:82:ca:12:fd:02:8b:90:16:20:12:a4
-	1c:5c:96:e3:18:c1:f1:e5:df:08:fe:62:67:17:c4:c5
-	48:8d:2c:b3:9b:e5:af:f9:25:26:19:2b:8e:92:2d:9b
-	11:
-
-prime2:
-	00:cb:c4:8a:db:5f:5d:76:8f:cf:38:83:3a:14:b7:5d
-	fc:ed:30:55:cb:c0:cf:86:c7:d5:a3:15:8b:8c:12:bd
-	e9:53:79:8f:d6:0e:e8:d1:24:fc:98:ae:81:72:54:d8
-	5d:ba:01:49:d0:4a:0f:4a:25:cc:8c:ba:9f:22:bf:e9
-	4e:32:40:8f:ec:38:5f:f2:58:14:ab:e9:15:41:d8:b4
-	67:4f:71:2d:f3:6d:0e:a3:a9:20:74:87:ec:00:59:11
-	3a:66:50:28:1d:5c:ba:73:c5:ca:a6:1f:62:3e:e2:51
-	b2:3e:de:fe:1b:23:1d:5f:94:3e:f6:71:11:7b:e5:a3
-	af:
-
-coefficient:
-	02:d3:29:69:75:11:ce:8f:c0:b0:60:50:8e:b3:f2:04
-	18:53:92:fd:ca:1b:27:e4:07:ba:36:bc:4b:13:7e:9d
-	38:c7:fa:c6:16:71:1d:6e:c8:ad:99:fd:29:f4:67:4b
-	a0:3e:db:9b:9a:14:fe:a1:0c:a3:4f:67:8c:a7:c3:e9
-	b5:a0:97:2b:4e:1b:05:2d:3b:d3:c5:eb:58:16:61:13
-	9f:fa:93:4c:47:62:e4:28:64:5a:b6:1d:4b:62:c3:9b
-	95:40:7b:dc:84:20:c3:48:5f:e2:cc:92:5b:1c:67:4c
-	dc:76:fe:6f:85:ac:29:3e:ce:2c:1d:1e:16:6a:e9:64
-	
-
-exp1:
-	43:03:fc:1f:2c:9b:16:33:76:a2:0b:e5:72:69:cd:13
-	55:7d:cb:7e:11:ed:09:1a:21:5c:a2:d5:cf:ec:e9:d5
-	f0:dc:1f:67:7f:d7:40:f6:65:bc:69:3c:e9:69:7b:75
-	c5:3a:fb:da:54:97:1d:76:06:2a:35:49:8a:19:99:04
-	a4:9d:cd:91:4e:27:ba:e4:b9:4f:1b:f1:6e:8e:4c:fa
-	33:05:92:f5:52:b4:45:44:9f:87:4d:d9:15:93:a8:e7
-	74:f1:a6:89:6c:f1:0d:ac:12:df:30:8c:98:f5:5b:2b
-	d2:40:dd:4d:c9:64:6a:a9:ad:ed:a9:8d:6c:4d:03:d1
-	
-
-exp2:
-	0f:21:ea:79:fe:2c:0f:b9:00:57:9f:0f:3a:28:9f:f7
-	3f:9a:1e:55:02:5d:a7:11:c2:20:d9:61:c2:a6:45:aa
-	45:43:ba:d5:d7:c7:9c:78:95:b5:b5:07:f1:f8:b1:14
-	cc:d2:79:ab:d9:44:27:6a:85:35:52:4a:ad:26:f9:69
-	90:3b:d1:34:66:bf:61:5c:ff:34:01:1c:4e:06:8c:e7
-	3b:34:19:88:81:69:db:e7:9c:7c:6a:f7:b0:d2:ec:7f
-	9c:c7:89:23:1d:16:cf:b0:39:ab:7a:9b:2e:36:5a:80
-	d5:40:74:38:89:b4:0d:bc:11:ac:f5:9a:a9:cb:d5:0b
-	
-
-
-Public Key PIN:
-	pin-sha256:mjtOqewy1ksBQMKsocXavXOMb4myTRZPF19oV/Q/fSg=
-Public Key ID:
-	sha256:9a3b4ea9ec32d64b0140c2aca1c5dabd738c6f89b24d164f175f6857f43f7d28
-	sha1:dede2d62628b84bba50ea7c59e70f2ff8b5ae360
-
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAwj+bjysZVCKel+4Qa50TEFN2O2TNY+hy/HTFz48imnDhSOBP
-aGpQRGb0wrsupszt29BSAwN+vEZVgruPLFRmVw96ItnppZSF9qf8mLiiMRey9r0I
-aNHzjs1U2BdnzpUXnAyQ310WTf9qynBxitSy5bVVjdhUH1tKN8HoTPlUjvY6TqWv
-sRGMjdxYsHR9KsIU8TM0CFyZQ6a2LGY6ksepdvoXHwSLCEXFVYoaxiwpk5799j4v
-5fh7TKh8NeNqeI7k7bu6GjLTFIBriL0XoGfR3S3rFhAmze7SPl/ViZ4QZQNa1ORu
-CPPaZuHQRSoX1ohc7JLOyR+ab0t/hQb22B3TnwIDAQABAoIBAF2SaoszBcaDzsX9
-RiewyMgqjF/cFRy1kv6N+eQcXVzsV3nVpCr2W6g3uFw98yEiwsoKthcBjgGAGB0b
-4MJH/eyeZgV315eNzmKdVY70Eh13/xvgv7ZOvPbjbqWR0M2xAGiJnRgcLWxxR64x
-MGDiSTNigM4NkahxP3VQkWjTCqq6lnACJHW5PDu2algiV2OnAoOwfCD4ywuM8BK9
-rFNlPFZUP3gpb1ebtvNUSCuEnT6O0VX7ApDXHC4TbYOVLaKvHKfmeN5IFeVc0CcN
-BXXDtVJjGTJc3S6PWp/tJM2p9rUxfRZ0dv0CaMISNX6ukyEZi12D+LsIBM+Enf5F
-tX0qT8ECgYEA9Apmbv2ZiZoxNcpsSDF+iz0GfHaYrI8WaQuYiWRWHL7usIfswfLl
-d1cNQcdzx5G4ZzlwqcqB9OR/oFiWURiqyKzkXT5mO48evgJ+LgmyhrbJN8Y7gsoS
-/QKLkBYgEqQcXJbjGMHx5d8I/mJnF8TFSI0ss5vlr/klJhkrjpItmxECgYEAy8SK
-219ddo/POIM6FLdd/O0wVcvAz4bH1aMVi4wSvelTeY/WDujRJPyYroFyVNhdugFJ
-0EoPSiXMjLqfIr/pTjJAj+w4X/JYFKvpFUHYtGdPcS3zbQ6jqSB0h+wAWRE6ZlAo
-HVy6c8XKph9iPuJRsj7e/hsjHV+UPvZxEXvlo68CgYBDA/wfLJsWM3aiC+Vyac0T
-VX3LfhHtCRohXKLVz+zp1fDcH2d/10D2ZbxpPOlpe3XFOvvaVJcddgYqNUmKGZkE
-pJ3NkU4nuuS5Txvxbo5M+jMFkvVStEVEn4dN2RWTqOd08aaJbPENrBLfMIyY9Vsr
-0kDdTclkaqmt7amNbE0D0QKBgA8h6nn+LA+5AFefDzoon/c/mh5VAl2nEcIg2WHC
-pkWqRUO61dfHnHiVtbUH8fixFMzSeavZRCdqhTVSSq0m+WmQO9E0Zr9hXP80ARxO
-BoznOzQZiIFp2+ecfGr3sNLsf5zHiSMdFs+wOat6my42WoDVQHQ4ibQNvBGs9Zqp
-y9ULAoGAAtMpaXURzo/AsGBQjrPyBBhTkv3KGyfkB7o2vEsTfp04x/rGFnEdbsit
-mf0p9GdLoD7bm5oU/qEMo09njKfD6bWglytOGwUtO9PF61gWYROf+pNMR2LkKGRa
-th1LYsOblUB73IQgw0hf4sySWxxnTNx2/m+FrCk+ziwdHhZq6WQ=
------END RSA PRIVATE KEY-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_smtp.cert.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_smtp.cert.pem
deleted file mode 100644
index 7c21d15e4a09e29754a0830aea76cc4b64460c2f..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_smtp.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIELDCCApSgAwIBAgIMWVJZ2go2ZAqJYZb6MA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI3MTMxMjU4WhcNMjcwNjI1MTMx
-MjU4WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBTTVRQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOGpArHUvqtPq3MHZMOgZDnEFRTpRyxG6LaLShnJh/gKDnhD
-tpbJLar4OQgFrQjRTZRDMSGevcdZeEw5xGKCauMaH6DflyS+yBnSMkFei/5NrVxz
-Kjot5hdL3v9CysBkKTj9jV8E03eiVbWzJDDabtwHD7ZJRAO8Lr+oi620rOEQgjUM
-LuwQB/ZA/6+ZfPT4coTX9ZoZEBqilJCh763MN6nSmumxlTeOt5ogjKrvwQCH1obE
-Hl2sEmWBtVMlKpLQeLEuwvClf+jRFd506XsC11g2z8JbL1i3rZW9ZKmV+TwKzoyd
-h3V1TKuZ2264sXv2NsXmywg4LnKbXiKXvpzMhLkCAwEAAaOBlzCBlDAMBgNVHRMB
-Af8EAjAAMB4GA1UdEQQXMBWCE3BhcmFtZXRlcnMtb3B0aW9uYWwwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUv4dKT8O7JUpx
-4Cr1sjAOEzIX6B0wHwYDVR0jBBgwFoAUN2vbkxxpfpJMa99zhfiEllmBT2swDQYJ
-KoZIhvcNAQELBQADggGBAGmU8DBxS0xg6YcB7zGSDCcdfzkX1iKDA02pcjbtGkC6
-QfoRAT+4GAabrZ3NDLwpXsdTXdq6xt83xZheA7S8XtWIjr07+BKHiTFmGiDbHFMv
-q+SfHX50Ku0mwBT1TnK3SddjN338kopGeCO7lf/7GZZPhZ9caIILOQ2Nh7kHULUY
-vMtWonFqVHTBBzUfSxYxy1tM8XthNnoI0IwaFDaVNKz7gWyg7NZvMZ++jZ423bcA
-DyVVt6D48BPyghVbndaRkJqVjKDsY/OX3OT9e/J16gj/l/4F2AdvkoVUFFW0Lgz0
-ROLPVILPuxv0hCa+tIhZSj1RAkh/bt8xJ9d4wKPecv6gKGqyKK5iJgIEcRdhT5+v
-Cqyv8Krh02ZNdWlJF7S1YE6suEkQGxAvO+JNlbnoARmhwq3xyqPvgIvGQeSabQnz
-J6uz61poiXt6uE/aGbqu0xmrcWP/r54BZPLsjGxDbpXUB0GNnjTX6FPWibL24Izn
-TLh9ZvfOkaGC2MQbE1dpHQ==
------END CERTIFICATE-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_smtp.key.pem b/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_smtp.key.pem
deleted file mode 100644
index 6b1b98801dbfb64e04e7047038cc81e074d1ff57..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/parameters-optional-stretch64_smtp.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:e1:a9:02:b1:d4:be:ab:4f:ab:73:07:64:c3:a0:64
-	39:c4:15:14:e9:47:2c:46:e8:b6:8b:4a:19:c9:87:f8
-	0a:0e:78:43:b6:96:c9:2d:aa:f8:39:08:05:ad:08:d1
-	4d:94:43:31:21:9e:bd:c7:59:78:4c:39:c4:62:82:6a
-	e3:1a:1f:a0:df:97:24:be:c8:19:d2:32:41:5e:8b:fe
-	4d:ad:5c:73:2a:3a:2d:e6:17:4b:de:ff:42:ca:c0:64
-	29:38:fd:8d:5f:04:d3:77:a2:55:b5:b3:24:30:da:6e
-	dc:07:0f:b6:49:44:03:bc:2e:bf:a8:8b:ad:b4:ac:e1
-	10:82:35:0c:2e:ec:10:07:f6:40:ff:af:99:7c:f4:f8
-	72:84:d7:f5:9a:19:10:1a:a2:94:90:a1:ef:ad:cc:37
-	a9:d2:9a:e9:b1:95:37:8e:b7:9a:20:8c:aa:ef:c1:00
-	87:d6:86:c4:1e:5d:ac:12:65:81:b5:53:25:2a:92:d0
-	78:b1:2e:c2:f0:a5:7f:e8:d1:15:de:74:e9:7b:02:d7
-	58:36:cf:c2:5b:2f:58:b7:ad:95:bd:64:a9:95:f9:3c
-	0a:ce:8c:9d:87:75:75:4c:ab:99:db:6e:b8:b1:7b:f6
-	36:c5:e6:cb:08:38:2e:72:9b:5e:22:97:be:9c:cc:84
-	b9:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	4d:cd:bc:04:1c:59:f1:2e:f2:ea:22:2e:77:d4:a1:39
-	d9:85:7b:44:43:29:dc:f8:f7:97:66:e1:25:3f:20:22
-	37:82:f7:b5:c8:9f:6c:83:7a:3a:0f:ae:05:4e:f8:fb
-	4a:97:30:25:6b:59:fb:95:b9:88:6e:92:6b:74:93:ed
-	e1:5f:ee:53:a9:05:1e:52:57:b4:c5:67:0c:76:30:24
-	10:15:c4:0f:57:27:e4:21:3c:23:92:d7:30:98:cc:ef
-	f9:9a:52:57:e4:8e:14:bd:7f:d7:ba:00:4c:67:c3:b9
-	51:25:f5:af:a5:27:b4:86:59:c6:7f:02:51:3d:1a:0b
-	b5:4f:83:24:6e:73:1c:a0:1a:46:71:1f:b8:3e:ab:19
-	a9:7d:1e:54:92:a3:a1:ed:8b:e0:55:91:5b:13:ee:e9
-	e7:1b:4a:3f:60:f7:7d:78:4e:0c:a0:e4:b3:95:d1:03
-	0a:1d:bc:e1:e4:9c:0f:cb:fd:d6:86:e2:de:d8:4f:cf
-	54:0e:d3:50:a3:dc:8a:b9:e6:40:83:bc:e3:a4:c4:ed
-	65:97:5a:a2:5c:1e:a8:2a:cb:be:e9:9b:b5:e8:8f:e0
-	44:b1:7f:ff:88:0e:dc:93:d8:76:7b:a7:27:8b:83:13
-	f4:0c:67:96:eb:4a:5e:17:39:61:52:c6:be:16:25:41
-	
-
-prime1:
-	00:f6:22:43:f8:65:09:7f:9f:8d:71:c3:81:0b:46:09
-	f8:91:57:f0:5d:b7:de:f4:87:0f:c4:f7:bb:a5:81:85
-	43:0a:c2:f5:23:cb:77:2f:a2:e7:0b:56:4b:c1:46:a3
-	99:49:be:f0:82:7a:bd:8b:e3:15:3c:ec:5f:76:3d:98
-	dd:1b:87:d0:e3:ed:fe:98:7f:92:e4:b3:db:ba:26:ac
-	92:99:70:37:bb:6e:0f:6c:ca:21:2c:ed:db:d3:96:57
-	b2:6b:14:f7:25:bb:18:60:cb:e8:b7:17:39:fc:03:8d
-	ce:a9:fc:a0:2d:4b:e2:68:81:e5:0d:17:b0:1f:2c:3a
-	0d:
-
-prime2:
-	00:ea:b4:a6:e7:b3:ab:2e:b5:84:c1:f4:2e:d0:c7:3a
-	b2:74:ab:64:3f:7e:df:6f:3c:ab:bf:5e:0c:de:db:54
-	1e:a8:3e:5b:aa:b5:b0:41:89:37:89:3c:e1:ea:f8:a8
-	26:4c:f6:e0:b5:be:f8:fd:3d:cb:4a:b6:84:04:f6:61
-	e4:af:01:73:c1:51:41:40:1c:c0:2c:2b:94:71:da:36
-	42:12:f6:da:dc:c4:4f:a2:3e:a2:b9:47:b0:5a:83:d1
-	59:04:3c:18:35:50:e1:a6:5e:fa:4d:c2:c9:f2:07:ac
-	40:df:ae:f0:f2:5d:70:dd:fc:bf:5d:99:57:d9:b3:a6
-	5d:
-
-coefficient:
-	00:a3:82:3f:d4:14:39:77:9a:df:dd:af:4c:48:d6:f4
-	a9:54:57:1d:7e:31:a9:3c:b5:41:7e:b3:8c:91:70:db
-	02:50:91:2d:7d:6b:d6:54:61:04:70:b9:59:01:7a:b7
-	68:c0:7d:ed:fd:3c:bb:b2:bb:18:d0:c4:c9:f7:e5:c0
-	c3:82:2b:d2:c4:ed:9a:c4:73:20:0d:75:d7:12:44:bb
-	bc:ad:15:4b:88:54:a4:4e:f8:26:a6:dd:83:96:dc:50
-	be:06:91:8b:6d:f3:c6:7d:27:12:7a:69:fa:f9:4c:71
-	a8:64:63:e2:22:da:c3:e6:de:96:25:21:5e:77:57:a1
-	b2:
-
-exp1:
-	52:de:4c:86:27:f6:5f:ba:a7:53:a3:20:22:5c:8d:64
-	dc:02:80:91:fd:23:1a:af:12:77:1d:75:57:0e:d9:80
-	2d:f2:5f:b8:92:7b:69:55:6e:76:99:b2:5d:bb:5b:bf
-	73:5d:ce:fa:0f:3b:1c:0a:f3:8e:94:82:bb:7b:97:a8
-	f1:e8:f3:42:9a:51:7a:a4:91:1f:61:12:dc:84:c2:db
-	84:bf:8c:74:15:65:2a:1a:8f:ba:e1:c6:7e:61:82:db
-	36:44:53:c5:a7:4d:58:e1:ae:53:5e:85:8e:3c:e0:14
-	b1:94:b5:95:2a:94:6a:dd:38:f2:04:84:ae:aa:24:4d
-	
-
-exp2:
-	18:99:88:a8:de:5f:01:cd:4a:b5:dd:77:0e:b0:e3:09
-	13:4b:67:7d:74:39:cc:f9:e9:f2:6b:d4:23:83:8f:84
-	8b:13:c6:1d:d5:5f:3c:ef:39:df:eb:7e:ae:57:13:a0
-	b8:0e:64:2d:08:70:26:72:d4:9c:e7:16:5d:42:c9:ad
-	e3:5d:de:99:13:80:28:4d:1b:23:46:0a:10:08:d4:09
-	06:dd:d2:c0:b2:de:b9:dd:a0:c6:94:a9:fa:42:b8:ad
-	80:d1:1f:a4:6e:ee:c7:b6:4a:bb:dd:bf:b6:db:71:05
-	77:ac:69:5a:ad:ca:87:a9:d7:10:e3:62:9e:d1:c2:8d
-	
-
-
-Public Key PIN:
-	pin-sha256:bpr41AjcEFiNhkgvoaVfnWDAbb/V6ytxSq6ZDEZF9gA=
-Public Key ID:
-	sha256:6e9af8d408dc10588d86482fa1a55f9d60c06dbfd5eb2b714aae990c4645f600
-	sha1:bf874a4fc3bb254a71e02af5b2300e133217e81d
-
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA4akCsdS+q0+rcwdkw6BkOcQVFOlHLEbototKGcmH+AoOeEO2
-lsktqvg5CAWtCNFNlEMxIZ69x1l4TDnEYoJq4xofoN+XJL7IGdIyQV6L/k2tXHMq
-Oi3mF0ve/0LKwGQpOP2NXwTTd6JVtbMkMNpu3AcPtklEA7wuv6iLrbSs4RCCNQwu
-7BAH9kD/r5l89PhyhNf1mhkQGqKUkKHvrcw3qdKa6bGVN463miCMqu/BAIfWhsQe
-XawSZYG1UyUqktB4sS7C8KV/6NEV3nTpewLXWDbPwlsvWLetlb1kqZX5PArOjJ2H
-dXVMq5nbbrixe/Y2xebLCDgucpteIpe+nMyEuQIDAQABAoIBAE3NvAQcWfEu8uoi
-LnfUoTnZhXtEQync+PeXZuElPyAiN4L3tcifbIN6Og+uBU74+0qXMCVrWfuVuYhu
-kmt0k+3hX+5TqQUeUle0xWcMdjAkEBXED1cn5CE8I5LXMJjM7/maUlfkjhS9f9e6
-AExnw7lRJfWvpSe0hlnGfwJRPRoLtU+DJG5zHKAaRnEfuD6rGal9HlSSo6Hti+BV
-kVsT7unnG0o/YPd9eE4MoOSzldEDCh284eScD8v91obi3thPz1QO01Cj3Iq55kCD
-vOOkxO1ll1qiXB6oKsu+6Zu16I/gRLF//4gO3JPYdnunJ4uDE/QMZ5brSl4XOWFS
-xr4WJUECgYEA9iJD+GUJf5+NccOBC0YJ+JFX8F233vSHD8T3u6WBhUMKwvUjy3cv
-oucLVkvBRqOZSb7wgnq9i+MVPOxfdj2Y3RuH0OPt/ph/kuSz27omrJKZcDe7bg9s
-yiEs7dvTlleyaxT3JbsYYMvotxc5/AONzqn8oC1L4miB5Q0XsB8sOg0CgYEA6rSm
-57OrLrWEwfQu0Mc6snSrZD9+3288q79eDN7bVB6oPluqtbBBiTeJPOHq+KgmTPbg
-tb74/T3LSraEBPZh5K8Bc8FRQUAcwCwrlHHaNkIS9trcxE+iPqK5R7Bag9FZBDwY
-NVDhpl76TcLJ8gesQN+u8PJdcN38v12ZV9mzpl0CgYBS3kyGJ/ZfuqdToyAiXI1k
-3AKAkf0jGq8Sdx11Vw7ZgC3yX7iSe2lVbnaZsl27W79zXc76DzscCvOOlIK7e5eo
-8ejzQppReqSRH2ES3ITC24S/jHQVZSoaj7rhxn5hgts2RFPFp01Y4a5TXoWOPOAU
-sZS1lSqUat048gSErqokTQKBgBiZiKjeXwHNSrXddw6w4wkTS2d9dDnM+enya9Qj
-g4+EixPGHdVfPO853+t+rlcToLgOZC0IcCZy1JznFl1Cya3jXd6ZE4AoTRsjRgoQ
-CNQJBt3SwLLeud2gxpSp+kK4rYDRH6Ru7se2Srvdv7bbcQV3rGlarcqHqdcQ42Ke
-0cKNAoGBAKOCP9QUOXea392vTEjW9KlUVx1+Mak8tUF+s4yRcNsCUJEtfWvWVGEE
-cLlZAXq3aMB97f08u7K7GNDEyfflwMOCK9LE7ZrEcyANddcSRLu8rRVLiFSkTvgm
-pt2DltxQvgaRi23zxn0nEnpp+vlMcahkY+Ii2sPm3pYlIV53V6Gy
------END RSA PRIVATE KEY-----
diff --git a/roles/mail_server/molecule/default/tests/data/x509/truststore.pem b/roles/mail_server/molecule/default/tests/data/x509/truststore.pem
deleted file mode 100644
index a41785fdd72787232ac39d645f36d2a0b7b04c11..0000000000000000000000000000000000000000
--- a/roles/mail_server/molecule/default/tests/data/x509/truststore.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEWTCCAsGgAwIBAgIMWVEJAy6O6Abooz68MA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI2MTMxNTQ3WhcNMzcwNjIxMTMx
-NTQ3WjBIMSIwIAYDVQQDExlFeGFtcGxlIEluYy4gVGVzdCBTaXRlIENBMRUwEwYD
-VQQKEwxFeGFtcGxlIEluYy4xCzAJBgNVBAYTAlNFMIIBojANBgkqhkiG9w0BAQEF
-AAOCAY8AMIIBigKCAYEAufYIYdFLn8Xo8a3c0cUj7s9WEUYKDE6ETmsNFdZee2hK
-qP2Li9bSr+vPjgMfi2UfxX/+i9x6LGqsIUxXVgrKlOf7R8bFg/runUI+4X1mZMJw
-dBc1POhjkdfRbtfOdu1LtztW4Pc2tnyrAtmhcNHUCXNGRfDNpFKtIFe4OTA/4/eP
-1EAyInHNqO2F8UgL8EDUMg9AQd4InVCPYRNlsv9j9qBVMjZiX7hoBC8k1laNkd4T
-IdV6zet3+M5Fp/W9lvxFI1yPXw/xWM7K9R3nepunKniuGmjBsac/ZHCUFqJaHz5K
-pXyMpSH1GTXOnIKFOldK4NYOzjCOR9Z+k63oJPZ+c7R9cKAZ7DERhS8X6MiykQ2s
-hDY68i7HSZd9Dy5oLlH63evbi/tWJSG9mE/UamYuzORKR4PNwixaKQbteiDU59wK
-azH5yQNGIqMSGkNgSsj9QW2NPkyNskuzCP04f77V/wSpum5PIygyuLidge9A+Vux
-eb5v7XBS8Zp3Wn78JYrlAgMBAAGjQzBBMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0P
-AQH/BAUDAwcGADAdBgNVHQ4EFgQUN2vbkxxpfpJMa99zhfiEllmBT2swDQYJKoZI
-hvcNAQELBQADggGBADNZ9eJA3Jm5TJQoDct+FZOc16XZDlteGBxVJj+aQUlBFlJK
-itvW/reR4SwZF/QRtCIzY7HN0rx0FVvfGR4sIcN2MALG+4Beee5nZR3KsNHhx895
-5ml7vqfNhnn/3/Gd7quqb2FskALfHAciuL+y0n/KcnnJ/3wZKR6xc5ON1VrwHSyI
-ENxRC8/oeO9SBc9V5gG5CyELftUiGBE73IIGjV/wXiwBvgwPB+j8vrv5nQrKPsLk
-b9ngSts/JSdiQH3cIbBpNoWz8Q8OIoQTt99GUKAScJX4UO7W5EHNmcCtCtOpgRg+
-Y49auOe/6A1n4rsLANZlDelhwCASQtZ04DdFl5QQpTuIOmd4l4KuNpqQ5Px+sxFu
-oPenBiQkXuQn9rQaFTTSc9jVBoumRp61P0mvoGusRzjYYvdL8zYoH/246eliWgyy
-60+/lgmDXpwf0a2d3fDTxuBmP1HlJYLUsS6ij+GKGgAOTCGmzygmyPOroDae+XOI
-G2o8G6ziU8d8RICIng==
------END CERTIFICATE-----
diff --git a/roles/mail_server/molecule/default/tests/test_default.py b/roles/mail_server/molecule/default/tests/test_default.py
index cc8438ed87f7e0d83037f90ce30b90c0191080ec..eae90d8f1bdefe6ada514d620d544c5667eaaf75 100644
--- a/roles/mail_server/molecule/default/tests/test_default.py
+++ b/roles/mail_server/molecule/default/tests/test_default.py
@@ -113,14 +113,14 @@ def test_ldap_tls_truststore_file(host):
     assert tls_file.user == 'root'
     assert tls_file.group == 'root'
     assert tls_file.mode == 0o644
-    assert tls_file.content_string == open("tests/data/x509/ca.cert.pem", "r").read().rstrip()
+    assert tls_file.content_string == open("tests/data/x509/ca/chain-full.cert.pem", "r").read().rstrip()
 
     tls_file = host.file('/var/spool/postfix/etc/ssl/certs/mail_ldap_tls_truststore.pem')
     assert tls_file.is_file
     assert tls_file.user == 'root'
     assert tls_file.group == 'root'
     assert tls_file.mode == 0o644
-    assert tls_file.content_string == open("tests/data/x509/ca.cert.pem", "r").read().rstrip()
+    assert tls_file.content_string == open("tests/data/x509/ca/chain-full.cert.pem", "r").read().rstrip()
 
 
 def test_mailname_file(host):
@@ -425,25 +425,25 @@ def test_imap_and_smtp_tls_files(host):
         assert tls_file.user == 'root'
         assert tls_file.group == 'root'
         assert tls_file.mode == 0o640
-        assert tls_file.content_string == open("tests/data/x509/%s_smtp.key.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_smtp.key.pem" % hostname, "r").read().rstrip()
 
         tls_file = host.file('/etc/ssl/certs/%s_smtp.pem' % hostname)
         assert tls_file.is_file
         assert tls_file.user == 'root'
         assert tls_file.group == 'root'
         assert tls_file.mode == 0o644
-        assert tls_file.content_string == open("tests/data/x509/%s_smtp.cert.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_smtp.cert.pem" % hostname, "r").read().rstrip()
 
         tls_file = host.file('/etc/ssl/private/%s_imap.key' % hostname)
         assert tls_file.is_file
         assert tls_file.user == 'root'
         assert tls_file.group == 'root'
         assert tls_file.mode == 0o640
-        assert tls_file.content_string == open("tests/data/x509/%s_imap.key.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_imap.key.pem" % hostname, "r").read().rstrip()
 
         tls_file = host.file('/etc/ssl/certs/%s_imap.pem' % hostname)
         assert tls_file.is_file
         assert tls_file.user == 'root'
         assert tls_file.group == 'root'
         assert tls_file.mode == 0o644
-        assert tls_file.content_string == open("tests/data/x509/%s_imap.cert.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_imap.cert.pem" % hostname, "r").read().rstrip()