diff --git a/t/baseline_data/default_testssl.csvfile b/t/baseline_data/default_testssl.csvfile
index 3b50649..89dd06e 100644
--- a/t/baseline_data/default_testssl.csvfile
+++ b/t/baseline_data/default_testssl.csvfile
@@ -100,36 +100,36 @@
 "LUCKY13","testssl.sh/81.169.235.32","443","LOW","potentially vulnerable, uses TLS CBC ciphers","CVE-2013-0169","CWE-310"
 "winshock","testssl.sh/81.169.235.32","443","OK","not vulnerable","CVE-2014-6321","CWE-94"
 "RC4","testssl.sh/81.169.235.32","443","OK","not vulnerable","CVE-2013-2566 CVE-2015-2808","CWE-310"
-"clientsimulation-android_70","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
-"clientsimulation-android_81","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
-"clientsimulation-android_90","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-android_X","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-android_11_12","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-android_13_14","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-android_15_16","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-chromium_137_win11","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-firefox_100_win10","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-firefox_137_win11","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
+"clientsimulation-android_70","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384        ECDH 256 (P-256)","",""
+"clientsimulation-android_81","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384        ECDH 253 (X25519)","",""
+"clientsimulation-android_90","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-android_X","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-android_11_12","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-android_13_14","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-android_15_16","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             X25519MLKEM768","",""
+"clientsimulation-chromium_137_win11","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             X25519MLKEM768","",""
+"clientsimulation-firefox_100_win10","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-firefox_137_win11","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             X25519MLKEM768","",""
 "clientsimulation-ie_8_win7","testssl.sh/81.169.235.32","443","INFO","No connection","",""
-"clientsimulation-ie_11_win7","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-SHA384","",""
-"clientsimulation-ie_11_win81","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-SHA384","",""
-"clientsimulation-ie_11_winphone81","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES128-SHA256","",""
-"clientsimulation-ie_11_win10","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
-"clientsimulation-edge_15_win10","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
-"clientsimulation-edge_101_win10_21h2","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-edge_133_win11_23h2","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-safari_184_osx_154","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-safari_264_all","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
+"clientsimulation-ie_11_win7","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-SHA384            ECDH 256 (P-256)","",""
+"clientsimulation-ie_11_win81","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-SHA384            ECDH 256 (P-256)","",""
+"clientsimulation-ie_11_winphone81","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES128-SHA256            ECDH 256 (P-256)","",""
+"clientsimulation-ie_11_win10","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384        ECDH 256 (P-256)","",""
+"clientsimulation-edge_15_win10","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384        ECDH 253 (X25519)","",""
+"clientsimulation-edge_101_win10_21h2","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-edge_133_win11_23h2","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             X25519MLKEM768","",""
+"clientsimulation-safari_184_osx_154","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-safari_264_all","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             X25519MLKEM768","",""
 "clientsimulation-java_7u25","testssl.sh/81.169.235.32","443","INFO","No connection","",""
-"clientsimulation-java_80442","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-java_1102","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-java_1703_2106","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-go_1178","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-libressl_336","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-openssl_102e","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
-"clientsimulation-openssl_111d","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-openssl_315","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-openssl_350","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-openssl_400","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
-"clientsimulation-apple_mail_16_0","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
-"clientsimulation-thunderbird_91_9","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
+"clientsimulation-java_80442","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-java_1102","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 256 (P-256)","",""
+"clientsimulation-java_1703_2106","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-go_1178","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-libressl_336","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-openssl_102e","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384        ECDH 256 (P-256)","",""
+"clientsimulation-openssl_111d","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-openssl_315","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""
+"clientsimulation-openssl_350","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             X25519MLKEM768","",""
+"clientsimulation-openssl_400","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             X25519MLKEM768","",""
+"clientsimulation-apple_mail_16_0","testssl.sh/81.169.235.32","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384        ECDH 256 (P-256)","",""
+"clientsimulation-thunderbird_91_9","testssl.sh/81.169.235.32","443","INFO","TLSv1.3 AEAD-AES256-GCM-SHA384             ECDH 253 (X25519)","",""