diff --git a/Tests/HummingbirdCoreTests/Certificates.swift b/Tests/HummingbirdCoreTests/Certificates.swift
index 23443d4..0cdd848 100644
--- a/Tests/HummingbirdCoreTests/Certificates.swift
+++ b/Tests/HummingbirdCoreTests/Certificates.swift
@@ -18,144 +18,144 @@ let testServerName = "hummingbird.codes"
 let caCertificateData =
 """
 -----BEGIN CERTIFICATE-----
-MIIDwTCCAqmgAwIBAgIUKfjf8C5YiDdbY4rMarSVis6oo0EwDQYJKoZIhvcNAQEL
+MIIDwTCCAqmgAwIBAgIUUiHSjSzaFu13DkpHtiUFZ/iepnMwDQYJKoZIhvcNAQEL
 BQAwcDELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDESMBAGA1UEBwwJ
 RWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQswCQYDVQQLDAJDQTEaMBgGA1UE
-AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0NDE0WhcNMjUwNDE4MTQ0
-NDE0WjBwMQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
+AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0OTM0WhcNMjkwNDE3MTQ0
+OTM0WjBwMQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
 DAlFZGluYnVyZ2gxEDAOBgNVBAoMB01RVFROSU8xCzAJBgNVBAsMAkNBMRowGAYD
 VQQDDBFodW1taW5nYmlyZC5jb2RlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANWuEu8RCvuU68C7+1IuSCl5fgxH1a2sGWUQ6McPVl0EteKGtl7irwKg
-kY9woOTBTs3U2hlv8jL0HlYFLGlowNrLN/AW5MhICtdJ5pjxKJzSy4dIPj46OB+L
-x57WgXttWKEE/VuYpYLutJ0kHI3b9CpPFcd2RJTxNX6yi/u4vivsOxraXXReErX4
-eRx/WtvAYwB/qehov20/KmkODdcuUb9Mw+2vY9IUl33NAUUL89pvTBBupa9PKZlH
-/lRORuj/mA3Ee6t+rwxgRjzKMd5LdzQuAmg0tQgYKdr95JORJb6EjCIlybhSriCy
-8TMMLC+LfT4C5ow0wZxXkJHJ33rTAj0CAwEAAaNTMFEwHQYDVR0OBBYEFCEjET+g
-ISNjRwsRscnF8Cnok+v0MB8GA1UdIwQYMBaAFCEjET+gISNjRwsRscnF8Cnok+v0
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAH7aDQk4vHXmB2S9
-12kykFEQNz/ik3YAldEZSdO9xHOPfcYy33ywSj9bTE/AO84FITXQWnm5VKzpn13r
-I1R/epzhdQbQ1p40Wx9QO3leDgjJxEwGCzQ+rxQAtPsAC545IKviWsICkeb1y2Yp
-PNcpTvILR9wKVoemwi8rgZfJvjB4XkOOjLPvcTJjYXx85+2ecxyU0YLMO9VkalKr
-NPwDXv3yijC6kGxYeHtn+KJpY5PxtCyTmpqwM3nmLaUo9VUKdDyHVLjY/1mxWNvh
-WYdoztOof6jKNJACIVE7rZM6QfmO3OTqS/1ocKb43DZYNvLY3LR/oH09J7+KMxEy
-ZQnLlLc=
+AQoCggEBALLoMsdOlGGQELxcRLRyfM2JlLJmJfdGvFiSf4DrDHphQcZuEWgenNFH
+C6zIVqxjcqBkYK59mu2tBK4aPPV9P1+lRYeJGAkAYcVAJH7TXHA6jUyHYRgVdocr
+12CuOxH0Vv+y6Kubx8OOlngziFRtO+dQzS47Z/tbC4f+rLr/5Fcl+bBYsQoQeJ77
+lgdC8erv7i4QLEEWy0V6dlQ7yGzW/EWmkwcsKk52F0aPO/eyAd4tIa6JOihE8f7Y
+YrrhYywQzFH1IKWBjA4OgpsGGToaGDmnXHY3peEeEXjPKmmHstKAua9jpJq3BMik
+jliXy3bjqCDoUoKvnPvqV9sr4fOhVpMCAwEAAaNTMFEwHQYDVR0OBBYEFJzoqU4M
+Ic07+4XWJ1eeZt8KXldAMB8GA1UdIwQYMBaAFJzoqU4MIc07+4XWJ1eeZt8KXldA
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC7IXWM0MinDHnxx
+F2aKhWqRIqLr72hiuYfYDD0r7jbibLeiX0iTIQDrwJ7BLl5onn7dHkJEMfhGf681
+PybWGw8P7OP1xdRKddEhYXNTQeDK5aMb+1lP8t6Eiz9MocOv1lTpz/EZgEk9qmhS
+9OX+LPFOVBV59B+KLu1qEW0jiN4SohRQQ+WOwAMKr91yB8weWrn8j8Jayz/Kb5cR
+578QG8YNGQ9aK/7KB828LMFF7xJhKadeZcJ0UZ3+cXkcGo223DPF4M78u4XQkwr7
+0YKdmym48lQ7w9JG9mpO6KMznBFYMtfs6FGWHgc55w5Fj8x1w/Cu8cXaE0Nlh1rh
+WoKhOMQ=
 -----END CERTIFICATE-----
 """
 
 let serverCertificateData =
 """
 -----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIUFdWnemty8vruo2ZpN67vgcxNlOcwDQYJKoZIhvcNAQEL
+MIIEADCCAuigAwIBAgIUeBiDWOR/D+D1DZhIGNwI9eImXI0wDQYJKoZIhvcNAQEL
 BQAwcDELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDESMBAGA1UEBwwJ
 RWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQswCQYDVQQLDAJDQTEaMBgGA1UE
-AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0NDE1WhcNMjUwNDE4MTQ0
-NDE1WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
+AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0OTM0WhcNMjkwNDE3MTQ0
+OTM0WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
 DAlFZGluYnVyZ2gxEDAOBgNVBAoMB01RVFROSU8xDzANBgNVBAsMBlNlcnZlcjEa
 MBgGA1UEAwwRaHVtbWluZ2JpcmQuY29kZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCqjiX8B84g8EkjCMSJHkrEQ53/LBsIjNnwMJfegAIn24fRTSXO
-62vOJ55Ed/FEhI2fyvwMbMYL4OOjnxFeQkWLPkUWjVjC9D5/edMLmyQNfccUTkRh
-w5BLJJEY88x4tqpLXgdADRfmJS326Y3+kQ1EqMDDtKdxCQ336h2b1aF87HpHU4a+
-WKJ0FL/bMvg3Gy7iqCWtqYsOIpSRlHUAKaUBvhGymgUjPIBc+1gq/Jdlrjwb04q3
-yy2giW1ZPAKtkabRWkV9vmIpEgOu8Fsq9Z73vBcdQI+HSlqdCvc0WMGeSdQ6KjwW
-YcM4sPkGWgBBRGakabtYURaEkQpllCYIUtqXAgMBAAGjgY0wgYowCwYDVR0PBAQD
+DwAwggEKAoIBAQDEt5I9LmTrF4SEBn0+fOVjtgyXwyLE+Lnjb349ZSFt3tAfK4SM
+L+LdWh3XcYpV6MfLuIOM5MekH1dkud1KzjX74J15tTUwoc9JPawylozP25g1WvGl
+8RjDYxvxkHgeovgTx1GnDncpl1RpzRBMyEwofu/yowqHJzgjHxCC+xLJrdM0SsZK
+oiK9d+EzrOvG/M/KQoodMaLVuBJ4nodGCXTvuIdeia4pAF7XZbl5FPiBXkg3YJJG
+lGU08fQFXAUULQkBo4ai+UB/WzuxmrF59TeQfM9OnDqRRiF99lwYvwdx0EAG8kaj
+E3ZR7Ra/zzppi9IYRZMk8Qa3AgthiKpN1YkRAgMBAAGjgY0wgYowCwYDVR0PBAQD
 AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAcBgNVHREEFTATghFo
-dW1taW5nYmlyZC5jb2RlczAdBgNVHQ4EFgQUXlHSXMGZXt2yIpNjnBe37kK/3Usw
-HwYDVR0jBBgwFoAUISMRP6AhI2NHCxGxycXwKeiT6/QwDQYJKoZIhvcNAQELBQAD
-ggEBAH/Jat1hg6ka/hu/B3NznobAPwXtb8bLp62c+y8+y0g7d4slSko3wwvK9pHa
-RjF24dSFoFwsPbCPAkV9QOd1aSIKIknpoa3B98wweW1OMsLX490WmCN90AoGuUfQ
-UJpNBf7SKVdTHxSZgOGmCu7rfroigQK/0G/3QfrwSfHpZMf+yCFPT745/C0MGu2v
-v2XgFr6XsSHGIjeTkFdNzZMW0x3ituawY5KK+FaYE1iItYAr6b1ZuYh/JTfJa7xS
-QQQOz24XZi6oyiY1SxonbmO4aqebv2YQS2Oqc1RRT6Ih/fF6qeJrLsSiajEeZq4u
-w5eKlsmOB/+Xe5z9vR9V/HH9PA0=
+dW1taW5nYmlyZC5jb2RlczAdBgNVHQ4EFgQU4Wz4DNy3TSgqG4b0Nczz8gJl2f0w
+HwYDVR0jBBgwFoAUnOipTgwhzTv7hdYnV55m3wpeV0AwDQYJKoZIhvcNAQELBQAD
+ggEBAFtA4zGz3w3GqA4W/HeknVSq25vNdlCiteYZ4H7ydadpzCFKDXnF/a0l3Y6s
+11QaCLifcD+cXMiWbBvoiwcvOk//02Sb6r6hj7gaaE3VC6WDswMo8qc4Wq/u+yKc
+eV2Eah+U6jc0IRwJwandhMB14Pt/SPYgb4T8zD230plrpSCU/FoImWS8b5BW5/fB
+0OgKntn/ZXmsdkmZpeTRk/xwObRIMx9XUEqh3WyRiuic8pT2iaVL+M5K9fGzxG6x
+dTOkaA/rFqbngyWpIk2QRFAMIG6WnSNIkmeyQ4wYIHecdRuho+2WAcgh3z3+7/Qt
+NGbZzOhXVptWveqV7pAyIxMJLD4=
 -----END CERTIFICATE-----
 """
 
 let serverPrivateKeyData =
 """
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCqjiX8B84g8Ekj
-CMSJHkrEQ53/LBsIjNnwMJfegAIn24fRTSXO62vOJ55Ed/FEhI2fyvwMbMYL4OOj
-nxFeQkWLPkUWjVjC9D5/edMLmyQNfccUTkRhw5BLJJEY88x4tqpLXgdADRfmJS32
-6Y3+kQ1EqMDDtKdxCQ336h2b1aF87HpHU4a+WKJ0FL/bMvg3Gy7iqCWtqYsOIpSR
-lHUAKaUBvhGymgUjPIBc+1gq/Jdlrjwb04q3yy2giW1ZPAKtkabRWkV9vmIpEgOu
-8Fsq9Z73vBcdQI+HSlqdCvc0WMGeSdQ6KjwWYcM4sPkGWgBBRGakabtYURaEkQpl
-lCYIUtqXAgMBAAECggEARM6PLXPaqXg3EU6+t1DEuhRLYAAjsdndLKT2B/odpIXQ
-79QPbkCU3/kkxRucdteBKVejQsH5Th5+x+pq/9t9ofTPu47vocsWkagMyBBhRZ4a
-HCuNM+HJSz9n2Ci3M3YCEuDOzPzbSOpz9jp4IhzTvQDVr76olJYiEAPfyRgxC6vU
-boKNj6uZIPl1OitRBhE3pbfYQfqSI+aZbaL1kMKXIOm7Kp3J5YW2GJrExbTpd68u
-llTjgBAZ1r5gZK33hRjRTN6n9lpLvOlTOXjpTo8BsJaW8mNuomrpteyGuYh02oOT
-bhE7359Hapqd94e+aQWsXBJy/lDCRGmzSX3OnOgMEQKBgQDiapYGJBPzlsYCYH1q
-+qADu5Gn8Y6zJUjdFX2dUsnqV9W6slivbj6ring8WGYMSgVNbFlzN0NT/ivRseIJ
-GWHxVPuYMN+54ASJMLzE8/YwrApMjnMXashvtOFGYfADraLvK7lU+F6tVQSbelzc
-hwJDeg/bPbyK6gZJprtQ0iwBUQKBgQDA1w/GEn+9DHIm4bEP35l99TkgKP7nR+G3
-U9hXEUpyuQrriV6Jeyb034Rb4dTTA5oxaEWtZGgrhT+Tk/axkw9XZPyv4C+sto0d
-0urFlPLeyS1Akq5+pMYA6rAMWY9xpa+dR14a1m2QOojW9rd/tqLkBgntL+iHxwYN
-c/7ji1xjZwKBgQCdtSJUmrKu/DlmFHGnn3TvxKnbMj10eSb8n+iEOdNdANtllK6D
-W6YZdHT1i5lhO/nfiPXxc+/YxHUfNek870oygEBTLM/ZN7nRGXqTMV8tXdg6pQpz
-qDR+4p37mWJGHZ8dOvZ3whyoXUy9Q4kFLqEcARykWKdIl2PTz2gwDoUKUQKBgBAQ
-2suRtvq1Er2SiAHeixcnWv8G61Wxc2imn5uBYUZ1jCdbZnjlvbUg+hH9mpGJ90qu
-eT+c4eDeVRGificFLX4Gd9bfQpmNC+y0KcMUSbet4wtCLS934tcotkoRHBZHy326
-+Ggb/TzK46OlIlyNhryglCsilqjZN/Pe+hlS/vt5AoGBAIyouY0PfWmw/kFoq3HI
-Vk1XqwKbzbJVCUn7yI6/cGQFAesA5KiYtsXU6AdBlRb0HwkfpwjveuGxoil5cWlC
-aLQIu9ECf5kQMBQcxCda1MSx01lXNojGEmFIa2z9eYg0xv49YrRTY5d4WZLI2MWJ
-zYeYwyrt1DpDkV71g9gROAf9
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEt5I9LmTrF4SE
+Bn0+fOVjtgyXwyLE+Lnjb349ZSFt3tAfK4SML+LdWh3XcYpV6MfLuIOM5MekH1dk
+ud1KzjX74J15tTUwoc9JPawylozP25g1WvGl8RjDYxvxkHgeovgTx1GnDncpl1Rp
+zRBMyEwofu/yowqHJzgjHxCC+xLJrdM0SsZKoiK9d+EzrOvG/M/KQoodMaLVuBJ4
+nodGCXTvuIdeia4pAF7XZbl5FPiBXkg3YJJGlGU08fQFXAUULQkBo4ai+UB/Wzux
+mrF59TeQfM9OnDqRRiF99lwYvwdx0EAG8kajE3ZR7Ra/zzppi9IYRZMk8Qa3Agth
+iKpN1YkRAgMBAAECggEAS8lPSUvU7G94iaa4XLkgZNxPmK5AeHM8pl8fWwbZrKsB
+MmkBHUMbm1yrD4P6ICPYyWcSI1dGhLfgYvlqRHYSfTHpaWjDD7PfGJ/udeTjZfb7
+el7Jpz0t5aSKsPOQG3l8qp4JGpurk/Xtuv8aTwKBuL5Csg9XMH+PFJTUtymEcPbe
+bm6C0fI4chfhiWZYfAcoBVAA7fUJlWoXnfmOPuvPUxhUgWOCfhufsjkK83Nya34T
+xUryvSym10Y7CqOp5ZxmEiN4X0gYswc8+/2ONB8c+WkAVa5iATRzICsnhaXkXk4E
+V55aQumKP34F9CDyoIG1x4autgUMxG6Hrv/WV18UcwKBgQDkIu1aLk7roVjYt600
+yf3srWh80zzmSWyzaQMDOh3IdgbVXIjA0ikK4b0zggD2cU3/9SuQBT1dFTRB7zp2
+pI2C4kNBNxSAd4k0OvTLaT8s/NcXGJvC50FQ13ocZeOUoUdpQ90mFToYoN2lwkdx
+qa3gE9q5LhV1yG55D8xvbTb6NwKBgQDcvkO2NqqUt4wJ3ZMnxzdAJTiwW7muJAQP
+2QBActp1vWHINy8EIDw1yCLHu7WBvc8qYTIDKVTXbRO/wWP3x5pqvw2XQKUhvaxH
+3Y48ox5ATy1uNUEfkuBi9UELRAVwnMUZkBm/LfBuWujjNk+e1uj1b9UnVFvgALey
+SGl8Rz/S9wKBgHOvZm7RhsGj6trSoWlgeHwZHyAVOg+I8i80NAvh35J0j1iIeOxW
+ZeuXtwq0hOpzYFtIJtP8ZDacdwhsWFgrb3sMY5BhbusKMrAiqVmwwBF/EU8r8mhu
+PkfRTKGz5SjMc9rkR/N01iYBBQR2NSZlJb+4MbSvssAsaCDJqyBh4HwXAoGBANae
+qqjzt6BGYQKKivPG7oIQbnCRjhOw8r4Rxvvib2LAUdzfQngpe0DzKFW3vH67dDuJ
+Kp4GRnX5mJT8y1xylkEpJmajtKn8hw+MaymrktMF6G7Zmkq/fCjauXXhmcRmt//l
+qhLF8JjrDLk06e7OlstjAwRtMbK2H+RYIS9y+qv7AoGALgIdgxlfnZMLw2HRrP2W
+AY3hwokGvwUD7GRZc+GHsdbKXlP9vgKYL/YURJg+EbPiROTHk44kcfiSlaXno4Pm
+gDDrRU1r2NG92OwDzZL1AcPUgReeHMZABM+XRYfa7h6e4Whq7ZUWPVxWW1VKqGvK
+pd+BCrHmzLFJhDJ2P1LfL4s=
 -----END PRIVATE KEY-----
 """
 
 let clientCertificateData =
 """
 -----BEGIN CERTIFICATE-----
-MIIDtDCCApygAwIBAgIUFdWnemty8vruo2ZpN67vgcxNlOgwDQYJKoZIhvcNAQEL
+MIIDtDCCApygAwIBAgIUeBiDWOR/D+D1DZhIGNwI9eImXI4wDQYJKoZIhvcNAQEL
 BQAwcDELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDESMBAGA1UEBwwJ
 RWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQswCQYDVQQLDAJDQTEaMBgGA1UE
-AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0NDE1WhcNMjUwNDE4MTQ0
-NDE1WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
+AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0OTM0WhcNMjkwNDE3MTQ0
+OTM0WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
 DAlFZGluYnVyZ2gxEDAOBgNVBAoMB01RVFROSU8xDzANBgNVBAsMBkNsaWVudDEa
 MBgGA1UEAwwRaHVtbWluZ2JpcmQuY29kZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDCRtVaN169jJsqZ7/oUndSKVBtII+IcSZz7KGSu6zgOLHxFaky
-NTF5R6w0b7TicnN0cWM+Fud7ywwp1PRNxaToPmemkpTpzd9LohDwg9wCqd5lM6eI
-R1+/uMuK1jZewS7sYymUuBoot3gA2ZLGEaatZQ1leo5iPStVm6Ali4njtiyXL0ae
-gznxDgRmdT2JWRJEq5TsjU3WLzLuDxVwgtLH2ChURwuCZg8Z04wd2kwRJk0jQ0ky
-cAs1UGiMN8F4TzLfPBkz7RL1IppaF5tRUCr00nG2nApeFWbYruebMMaroie7XAo9
-ujdLhLGoCNgrtccaWjPf4VZ0MzQhh5dQSw6FAgMBAAGjQjBAMB0GA1UdDgQWBBRE
-ZiwX8rGgnNQCR5KTI1L4Ra55ZDAfBgNVHSMEGDAWgBQhIxE/oCEjY0cLEbHJxfAp
-6JPr9DANBgkqhkiG9w0BAQsFAAOCAQEAduIn7LzBHCEX+E9GPjNxqODBPshlcJgq
-sCS0uWhxzSM5VrqZlzKvjdtTwz5BJxYGEqL67pCvMNPezRK5dM1sCK+BTXkZeOUR
-0I/hAmxmPS1LKZnqrPeELP5b/FEOHnQ91O+zunC8EkFzKpp+czzP0GNUTq46dHa6
-wuFGFkA7vFwM9B412vqSE8OlY/8vPyDuJ5UTjgaKI9QbddIw6EmIYyaaqAv69EVH
-ypRjyAQLysrT8sijI3zguLtQSwTO3u+Pr+pZC6tmNU+fPVy70ggcQh4WHi0UZQhm
-zXcvUhMFzYae02NmyOM5hip/lbnRxJW6dyND1L/f+bglG+wc6eC+Jw==
+DwAwggEKAoIBAQDl1r/Q/A32xWT6cqL7eCPERi6vNf3a20lHEBAu2PBQslPN4M9q
+6jo5+oNzOtpTNViG/aiP/OHTqDqgy2aSlX/TB6G+g9jga1JhTttkbXOvPPHqcJwI
+vjOkvusuE2YunGblQpz2s+vAtIMVYrOul4zNDX8dRJ5UIkWE9hzstz9ZbJ8Idrv7
+bGjf481HLomcpeZoB0s1L7A5aj3y2EK2OncFn2SknKHS4GlPlcSsiv8k+6JmTbLu
+kH1xoZGXWs/aU9bnBwfkYBL3FSl75iksMZwHAZEtzqq3tlFAQvhkeG5mCYZpyv8b
+MZRMmrxrHqNeXLaldgwRFLqwC8u3vMQ1i+QvAgMBAAGjQjBAMB0GA1UdDgQWBBRO
+acCi1/80y4D3DzW9IJK29eHVyDAfBgNVHSMEGDAWgBSc6KlODCHNO/uF1idXnmbf
+Cl5XQDANBgkqhkiG9w0BAQsFAAOCAQEAj+hs91BDbsjE8cZQQTR9WOFtReyEnBne
+ouuaaEER+BXUmHokLIiLVTy9GLjd8gufr7FaKUzJiN92Buq48YsGAWckDVsIiTJB
+3vJspbTAXbjxO1sr9eE+bPlinIKT0w759y9XLvsJ7qQcsietZjVSkVyFZT9J2bLQ
+aVONSHoQiHEz3ehliW2X+G/wMddJiVeN4jYi1mkwpdLEVduPVk0M6Meph70uO61Z
+M0WLyu07Wqvbipnq2/9HoBEySnu2JD/6WLcj2crOTb4umL/WEiL8W1xwBfhtdkHM
+gx7I4HCRr/j57YULiCDwqIs46YAJ795w4nBCu4DMxsZiH/zBcekBCw==
 -----END CERTIFICATE-----
 """
 
 let clientPrivateKeyData =
 """
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCRtVaN169jJsq
-Z7/oUndSKVBtII+IcSZz7KGSu6zgOLHxFakyNTF5R6w0b7TicnN0cWM+Fud7ywwp
-1PRNxaToPmemkpTpzd9LohDwg9wCqd5lM6eIR1+/uMuK1jZewS7sYymUuBoot3gA
-2ZLGEaatZQ1leo5iPStVm6Ali4njtiyXL0aegznxDgRmdT2JWRJEq5TsjU3WLzLu
-DxVwgtLH2ChURwuCZg8Z04wd2kwRJk0jQ0kycAs1UGiMN8F4TzLfPBkz7RL1Ippa
-F5tRUCr00nG2nApeFWbYruebMMaroie7XAo9ujdLhLGoCNgrtccaWjPf4VZ0MzQh
-h5dQSw6FAgMBAAECggEAQZ9dh8i2Nr6c1vkOiLH6XgVYhlP+R684tuWSOhcssNxV
-tsKDUVNIb9f24gtthSP1vbpjNGDWNimC5Upqby64oj4aEtjmdgc1Sr3mjOdtVHT+
-ix6kk1LQk9ke37m1ydHlQLHKJNL++wvl/BuCCWeC7oT4vnNkTuisj5Euyh/VJtYW
-h0HlOHt0kxiuqdU/ynxuQOdVUPT5KGZ4MCXHNWtapKanpGsXgDvQcweiqzgPBirQ
-svSOGF1oEYDqPt73sDl9nrYsZtS8hD1BK69eN5p1zcfinXuPWlpPTic3viYTTqed
-85mS7fWChuuxCijpZDiuw0+0LXjK+4b2AnEOtwasjQKBgQDlanmsMYolw9kj003W
-c6hZomOxKDzkkrQ29/l1VmmV9r1q7423by8k43Mqb8NXUKl+46we1LAK2xEnv9yt
-gDhIy5AhTPOSKyrnF+WQWu2Edbse7nOE3MA+8/b1I2ekBuRHV0PyoUOUs8+R4U+b
-+RXzHV2l2ZU4rvp8U1zNO6QUswKBgQDYyffTpEcFmWBiljslueDd2w4TtZPpNQ1q
-scBJtscGoE+exSx2yZebq016MrlurwzjLroLAS7jDKxyVLJturcm21IxaWVQQO7E
-jz4VGs4i5DCz2Uh20coq+ctXfWWA0KzwdoKSFUJwiYEEABs/ic6eHCib+xGVeCJe
-lOw/YHyb5wKBgGY8uxhnw17tFpmGk0uco0u+uJq8idZ7ImDUxZDq/4bbPLKpKwiy
-Pdo8mpgw0mbZBZAMuinLMuDDm7ORJzES0QJv5T1R48IiBq6R0bYxL2Q2aztvnH97
-ORlU85tvOcK5Z4X7d8Zq44kjUL98H1Qs/wEm9xLwEjX+lJZPOC4mBAtNAoGBANW0
-u56h+fVWDkMBb8sv4rExiT36qJWjW9eK5FCGYspwbCzKmJt8/PxTMSw+JrgqzhyC
-apoAj5T5YGHQhphPEM+4Mt1M1bf4WqffwUaSxxR0OGKC1sFy68XTuxVDIzWKAIGH
-gg258WX41vr3k+Td15Xbkli5dssOw2rTidSsLAqPAoGAVERDZjFnAPYM8pyT85ub
-/0M5k8HKgg85SfBQZs+4Q8sxG/Giwim2V6knVNvTWydBbVepNeh13tCT3/9sB8gD
-/yzuA301EheusrmaGq8WP7CITpQaKQva1CoH8slqIl482YIxI9v3Dpb9VcD65+Iw
-WvSA0FNqabkiyaEAz35lZWM=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDl1r/Q/A32xWT6
+cqL7eCPERi6vNf3a20lHEBAu2PBQslPN4M9q6jo5+oNzOtpTNViG/aiP/OHTqDqg
+y2aSlX/TB6G+g9jga1JhTttkbXOvPPHqcJwIvjOkvusuE2YunGblQpz2s+vAtIMV
+YrOul4zNDX8dRJ5UIkWE9hzstz9ZbJ8Idrv7bGjf481HLomcpeZoB0s1L7A5aj3y
+2EK2OncFn2SknKHS4GlPlcSsiv8k+6JmTbLukH1xoZGXWs/aU9bnBwfkYBL3FSl7
+5iksMZwHAZEtzqq3tlFAQvhkeG5mCYZpyv8bMZRMmrxrHqNeXLaldgwRFLqwC8u3
+vMQ1i+QvAgMBAAECggEAEcPHALayt5urQeZhbZFsJkwMaLOCIwvm/oyhy5UuAfa+
+nn+dWJSxGnEf/uSSInNRm+F4SWTQ6aSrn2kJTRQsFJoW6NxVA4eYDvhi4cDJ+8X4
+pte8X7qf0ECHegC62ahyFY9QBYuDkdoB9cGyxLBnDCRaal8246bge7XwJ2XEijtD
+ENRIZVx90l5MJASq3NE7890JqTFkOyyEGmWloBkyNL5EYfjnucU3EzTaA4GTmIoW
+jE1QvqHdXjUTI66qcC4XFYYY+1AUGDQmimGEEnMM3RH/6SOG5kbDUfESbGl2UJCY
+okqD5pPOEtr3Ew5nh7k0N28IjK7jVx0pSzXfinQbdQKBgQD2nRfIY8pG57QsIAS6
+eimGGnKDCsbGloW48iB0HhyqMC9tsKWMRUQ9dfGUWRWVJ2cuQaxTPonlyvmVi/cu
+0f+km1MBm99lD7R9bjWRNkMxyISp7gBmKEjgJARLhXWnUDa8Df3q908pGrFOZHZn
+GjHXiqmJKTL1N3R5nL8pJSl+zQKBgQDuljWgGKmT6hR3A35DmaZCLXCFCiOAqmkK
+lDnDo+0Q78tUtsy5L6m5KIJxjWvOgTJa56nJNqdApXI4TEotVWxQo1OsdN83GaAP
+QgTeNc4a/pbuayuifrdsrYwBUiRfu9hW74QXmOuCB693X9uT3gsv7uTfGfFi7AUL
+FLCzFAp26wKBgHhkdInVfZhj4Sdxch1/KepX2vNyPVwRe7KwMXu+f4vt/hl0lT0H
+S6sdexRK8ShhlhOU6AWzkCpojrOdIszuo/i+AyXT7Jkvs5NQTEJZ1S/mji1PDU7R
+99HEg3xC6Q8HL9Fam00r8q9EYq68iLkIprBs9xsIy+G+ctQz23bAt6M5AoGBALiM
+HdzBVuJgDQZmAFO/1NeZmFCAICgVKH0TXH8VHHmeUlQrtb2Eva7IQ+Ybswkf7Fhe
+m3lVuheKIgikEjhwvAC/5Sgfms1fF+zVbziGu+8rgInZAf6GL9FziDk5VYNrpJLS
+YAV0tq50zWf0EL+W4GZqTkS4J3wR/nCsx2Utmk6TAoGAS/ofmABSGD6181fzlfN7
+q9a9mxykbIc4MWOaiGjrutqmNdYwZG/UDnQO05oJY8700pxkWN4iuaF7GiR5ME3W
+s5m4xgLN0gEWRrAnNBoXggd0p2jZ08a5U5UAeRb3viRJjyd9CPlztSSAPMtAuuWH
+NHNYNGGPCb3FUSlzPL0Qjf4=
 -----END PRIVATE KEY-----
 """
diff --git a/Tests/HummingbirdCoreTests/Certificates/server.p12 b/Tests/HummingbirdCoreTests/Certificates/server.p12
index 87c37a6..2cf2f8d 100644
Binary files a/Tests/HummingbirdCoreTests/Certificates/server.p12 and b/Tests/HummingbirdCoreTests/Certificates/server.p12 differ
diff --git a/Tests/HummingbirdTLSTests/Certificates.swift b/Tests/HummingbirdTLSTests/Certificates.swift
index 23443d4..0cdd848 100644
--- a/Tests/HummingbirdTLSTests/Certificates.swift
+++ b/Tests/HummingbirdTLSTests/Certificates.swift
@@ -18,144 +18,144 @@ let testServerName = "hummingbird.codes"
 let caCertificateData =
 """
 -----BEGIN CERTIFICATE-----
-MIIDwTCCAqmgAwIBAgIUKfjf8C5YiDdbY4rMarSVis6oo0EwDQYJKoZIhvcNAQEL
+MIIDwTCCAqmgAwIBAgIUUiHSjSzaFu13DkpHtiUFZ/iepnMwDQYJKoZIhvcNAQEL
 BQAwcDELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDESMBAGA1UEBwwJ
 RWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQswCQYDVQQLDAJDQTEaMBgGA1UE
-AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0NDE0WhcNMjUwNDE4MTQ0
-NDE0WjBwMQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
+AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0OTM0WhcNMjkwNDE3MTQ0
+OTM0WjBwMQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
 DAlFZGluYnVyZ2gxEDAOBgNVBAoMB01RVFROSU8xCzAJBgNVBAsMAkNBMRowGAYD
 VQQDDBFodW1taW5nYmlyZC5jb2RlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANWuEu8RCvuU68C7+1IuSCl5fgxH1a2sGWUQ6McPVl0EteKGtl7irwKg
-kY9woOTBTs3U2hlv8jL0HlYFLGlowNrLN/AW5MhICtdJ5pjxKJzSy4dIPj46OB+L
-x57WgXttWKEE/VuYpYLutJ0kHI3b9CpPFcd2RJTxNX6yi/u4vivsOxraXXReErX4
-eRx/WtvAYwB/qehov20/KmkODdcuUb9Mw+2vY9IUl33NAUUL89pvTBBupa9PKZlH
-/lRORuj/mA3Ee6t+rwxgRjzKMd5LdzQuAmg0tQgYKdr95JORJb6EjCIlybhSriCy
-8TMMLC+LfT4C5ow0wZxXkJHJ33rTAj0CAwEAAaNTMFEwHQYDVR0OBBYEFCEjET+g
-ISNjRwsRscnF8Cnok+v0MB8GA1UdIwQYMBaAFCEjET+gISNjRwsRscnF8Cnok+v0
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAH7aDQk4vHXmB2S9
-12kykFEQNz/ik3YAldEZSdO9xHOPfcYy33ywSj9bTE/AO84FITXQWnm5VKzpn13r
-I1R/epzhdQbQ1p40Wx9QO3leDgjJxEwGCzQ+rxQAtPsAC545IKviWsICkeb1y2Yp
-PNcpTvILR9wKVoemwi8rgZfJvjB4XkOOjLPvcTJjYXx85+2ecxyU0YLMO9VkalKr
-NPwDXv3yijC6kGxYeHtn+KJpY5PxtCyTmpqwM3nmLaUo9VUKdDyHVLjY/1mxWNvh
-WYdoztOof6jKNJACIVE7rZM6QfmO3OTqS/1ocKb43DZYNvLY3LR/oH09J7+KMxEy
-ZQnLlLc=
+AQoCggEBALLoMsdOlGGQELxcRLRyfM2JlLJmJfdGvFiSf4DrDHphQcZuEWgenNFH
+C6zIVqxjcqBkYK59mu2tBK4aPPV9P1+lRYeJGAkAYcVAJH7TXHA6jUyHYRgVdocr
+12CuOxH0Vv+y6Kubx8OOlngziFRtO+dQzS47Z/tbC4f+rLr/5Fcl+bBYsQoQeJ77
+lgdC8erv7i4QLEEWy0V6dlQ7yGzW/EWmkwcsKk52F0aPO/eyAd4tIa6JOihE8f7Y
+YrrhYywQzFH1IKWBjA4OgpsGGToaGDmnXHY3peEeEXjPKmmHstKAua9jpJq3BMik
+jliXy3bjqCDoUoKvnPvqV9sr4fOhVpMCAwEAAaNTMFEwHQYDVR0OBBYEFJzoqU4M
+Ic07+4XWJ1eeZt8KXldAMB8GA1UdIwQYMBaAFJzoqU4MIc07+4XWJ1eeZt8KXldA
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC7IXWM0MinDHnxx
+F2aKhWqRIqLr72hiuYfYDD0r7jbibLeiX0iTIQDrwJ7BLl5onn7dHkJEMfhGf681
+PybWGw8P7OP1xdRKddEhYXNTQeDK5aMb+1lP8t6Eiz9MocOv1lTpz/EZgEk9qmhS
+9OX+LPFOVBV59B+KLu1qEW0jiN4SohRQQ+WOwAMKr91yB8weWrn8j8Jayz/Kb5cR
+578QG8YNGQ9aK/7KB828LMFF7xJhKadeZcJ0UZ3+cXkcGo223DPF4M78u4XQkwr7
+0YKdmym48lQ7w9JG9mpO6KMznBFYMtfs6FGWHgc55w5Fj8x1w/Cu8cXaE0Nlh1rh
+WoKhOMQ=
 -----END CERTIFICATE-----
 """
 
 let serverCertificateData =
 """
 -----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIUFdWnemty8vruo2ZpN67vgcxNlOcwDQYJKoZIhvcNAQEL
+MIIEADCCAuigAwIBAgIUeBiDWOR/D+D1DZhIGNwI9eImXI0wDQYJKoZIhvcNAQEL
 BQAwcDELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDESMBAGA1UEBwwJ
 RWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQswCQYDVQQLDAJDQTEaMBgGA1UE
-AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0NDE1WhcNMjUwNDE4MTQ0
-NDE1WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
+AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0OTM0WhcNMjkwNDE3MTQ0
+OTM0WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
 DAlFZGluYnVyZ2gxEDAOBgNVBAoMB01RVFROSU8xDzANBgNVBAsMBlNlcnZlcjEa
 MBgGA1UEAwwRaHVtbWluZ2JpcmQuY29kZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCqjiX8B84g8EkjCMSJHkrEQ53/LBsIjNnwMJfegAIn24fRTSXO
-62vOJ55Ed/FEhI2fyvwMbMYL4OOjnxFeQkWLPkUWjVjC9D5/edMLmyQNfccUTkRh
-w5BLJJEY88x4tqpLXgdADRfmJS326Y3+kQ1EqMDDtKdxCQ336h2b1aF87HpHU4a+
-WKJ0FL/bMvg3Gy7iqCWtqYsOIpSRlHUAKaUBvhGymgUjPIBc+1gq/Jdlrjwb04q3
-yy2giW1ZPAKtkabRWkV9vmIpEgOu8Fsq9Z73vBcdQI+HSlqdCvc0WMGeSdQ6KjwW
-YcM4sPkGWgBBRGakabtYURaEkQpllCYIUtqXAgMBAAGjgY0wgYowCwYDVR0PBAQD
+DwAwggEKAoIBAQDEt5I9LmTrF4SEBn0+fOVjtgyXwyLE+Lnjb349ZSFt3tAfK4SM
+L+LdWh3XcYpV6MfLuIOM5MekH1dkud1KzjX74J15tTUwoc9JPawylozP25g1WvGl
+8RjDYxvxkHgeovgTx1GnDncpl1RpzRBMyEwofu/yowqHJzgjHxCC+xLJrdM0SsZK
+oiK9d+EzrOvG/M/KQoodMaLVuBJ4nodGCXTvuIdeia4pAF7XZbl5FPiBXkg3YJJG
+lGU08fQFXAUULQkBo4ai+UB/WzuxmrF59TeQfM9OnDqRRiF99lwYvwdx0EAG8kaj
+E3ZR7Ra/zzppi9IYRZMk8Qa3AgthiKpN1YkRAgMBAAGjgY0wgYowCwYDVR0PBAQD
 AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAcBgNVHREEFTATghFo
-dW1taW5nYmlyZC5jb2RlczAdBgNVHQ4EFgQUXlHSXMGZXt2yIpNjnBe37kK/3Usw
-HwYDVR0jBBgwFoAUISMRP6AhI2NHCxGxycXwKeiT6/QwDQYJKoZIhvcNAQELBQAD
-ggEBAH/Jat1hg6ka/hu/B3NznobAPwXtb8bLp62c+y8+y0g7d4slSko3wwvK9pHa
-RjF24dSFoFwsPbCPAkV9QOd1aSIKIknpoa3B98wweW1OMsLX490WmCN90AoGuUfQ
-UJpNBf7SKVdTHxSZgOGmCu7rfroigQK/0G/3QfrwSfHpZMf+yCFPT745/C0MGu2v
-v2XgFr6XsSHGIjeTkFdNzZMW0x3ituawY5KK+FaYE1iItYAr6b1ZuYh/JTfJa7xS
-QQQOz24XZi6oyiY1SxonbmO4aqebv2YQS2Oqc1RRT6Ih/fF6qeJrLsSiajEeZq4u
-w5eKlsmOB/+Xe5z9vR9V/HH9PA0=
+dW1taW5nYmlyZC5jb2RlczAdBgNVHQ4EFgQU4Wz4DNy3TSgqG4b0Nczz8gJl2f0w
+HwYDVR0jBBgwFoAUnOipTgwhzTv7hdYnV55m3wpeV0AwDQYJKoZIhvcNAQELBQAD
+ggEBAFtA4zGz3w3GqA4W/HeknVSq25vNdlCiteYZ4H7ydadpzCFKDXnF/a0l3Y6s
+11QaCLifcD+cXMiWbBvoiwcvOk//02Sb6r6hj7gaaE3VC6WDswMo8qc4Wq/u+yKc
+eV2Eah+U6jc0IRwJwandhMB14Pt/SPYgb4T8zD230plrpSCU/FoImWS8b5BW5/fB
+0OgKntn/ZXmsdkmZpeTRk/xwObRIMx9XUEqh3WyRiuic8pT2iaVL+M5K9fGzxG6x
+dTOkaA/rFqbngyWpIk2QRFAMIG6WnSNIkmeyQ4wYIHecdRuho+2WAcgh3z3+7/Qt
+NGbZzOhXVptWveqV7pAyIxMJLD4=
 -----END CERTIFICATE-----
 """
 
 let serverPrivateKeyData =
 """
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCqjiX8B84g8Ekj
-CMSJHkrEQ53/LBsIjNnwMJfegAIn24fRTSXO62vOJ55Ed/FEhI2fyvwMbMYL4OOj
-nxFeQkWLPkUWjVjC9D5/edMLmyQNfccUTkRhw5BLJJEY88x4tqpLXgdADRfmJS32
-6Y3+kQ1EqMDDtKdxCQ336h2b1aF87HpHU4a+WKJ0FL/bMvg3Gy7iqCWtqYsOIpSR
-lHUAKaUBvhGymgUjPIBc+1gq/Jdlrjwb04q3yy2giW1ZPAKtkabRWkV9vmIpEgOu
-8Fsq9Z73vBcdQI+HSlqdCvc0WMGeSdQ6KjwWYcM4sPkGWgBBRGakabtYURaEkQpl
-lCYIUtqXAgMBAAECggEARM6PLXPaqXg3EU6+t1DEuhRLYAAjsdndLKT2B/odpIXQ
-79QPbkCU3/kkxRucdteBKVejQsH5Th5+x+pq/9t9ofTPu47vocsWkagMyBBhRZ4a
-HCuNM+HJSz9n2Ci3M3YCEuDOzPzbSOpz9jp4IhzTvQDVr76olJYiEAPfyRgxC6vU
-boKNj6uZIPl1OitRBhE3pbfYQfqSI+aZbaL1kMKXIOm7Kp3J5YW2GJrExbTpd68u
-llTjgBAZ1r5gZK33hRjRTN6n9lpLvOlTOXjpTo8BsJaW8mNuomrpteyGuYh02oOT
-bhE7359Hapqd94e+aQWsXBJy/lDCRGmzSX3OnOgMEQKBgQDiapYGJBPzlsYCYH1q
-+qADu5Gn8Y6zJUjdFX2dUsnqV9W6slivbj6ring8WGYMSgVNbFlzN0NT/ivRseIJ
-GWHxVPuYMN+54ASJMLzE8/YwrApMjnMXashvtOFGYfADraLvK7lU+F6tVQSbelzc
-hwJDeg/bPbyK6gZJprtQ0iwBUQKBgQDA1w/GEn+9DHIm4bEP35l99TkgKP7nR+G3
-U9hXEUpyuQrriV6Jeyb034Rb4dTTA5oxaEWtZGgrhT+Tk/axkw9XZPyv4C+sto0d
-0urFlPLeyS1Akq5+pMYA6rAMWY9xpa+dR14a1m2QOojW9rd/tqLkBgntL+iHxwYN
-c/7ji1xjZwKBgQCdtSJUmrKu/DlmFHGnn3TvxKnbMj10eSb8n+iEOdNdANtllK6D
-W6YZdHT1i5lhO/nfiPXxc+/YxHUfNek870oygEBTLM/ZN7nRGXqTMV8tXdg6pQpz
-qDR+4p37mWJGHZ8dOvZ3whyoXUy9Q4kFLqEcARykWKdIl2PTz2gwDoUKUQKBgBAQ
-2suRtvq1Er2SiAHeixcnWv8G61Wxc2imn5uBYUZ1jCdbZnjlvbUg+hH9mpGJ90qu
-eT+c4eDeVRGificFLX4Gd9bfQpmNC+y0KcMUSbet4wtCLS934tcotkoRHBZHy326
-+Ggb/TzK46OlIlyNhryglCsilqjZN/Pe+hlS/vt5AoGBAIyouY0PfWmw/kFoq3HI
-Vk1XqwKbzbJVCUn7yI6/cGQFAesA5KiYtsXU6AdBlRb0HwkfpwjveuGxoil5cWlC
-aLQIu9ECf5kQMBQcxCda1MSx01lXNojGEmFIa2z9eYg0xv49YrRTY5d4WZLI2MWJ
-zYeYwyrt1DpDkV71g9gROAf9
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEt5I9LmTrF4SE
+Bn0+fOVjtgyXwyLE+Lnjb349ZSFt3tAfK4SML+LdWh3XcYpV6MfLuIOM5MekH1dk
+ud1KzjX74J15tTUwoc9JPawylozP25g1WvGl8RjDYxvxkHgeovgTx1GnDncpl1Rp
+zRBMyEwofu/yowqHJzgjHxCC+xLJrdM0SsZKoiK9d+EzrOvG/M/KQoodMaLVuBJ4
+nodGCXTvuIdeia4pAF7XZbl5FPiBXkg3YJJGlGU08fQFXAUULQkBo4ai+UB/Wzux
+mrF59TeQfM9OnDqRRiF99lwYvwdx0EAG8kajE3ZR7Ra/zzppi9IYRZMk8Qa3Agth
+iKpN1YkRAgMBAAECggEAS8lPSUvU7G94iaa4XLkgZNxPmK5AeHM8pl8fWwbZrKsB
+MmkBHUMbm1yrD4P6ICPYyWcSI1dGhLfgYvlqRHYSfTHpaWjDD7PfGJ/udeTjZfb7
+el7Jpz0t5aSKsPOQG3l8qp4JGpurk/Xtuv8aTwKBuL5Csg9XMH+PFJTUtymEcPbe
+bm6C0fI4chfhiWZYfAcoBVAA7fUJlWoXnfmOPuvPUxhUgWOCfhufsjkK83Nya34T
+xUryvSym10Y7CqOp5ZxmEiN4X0gYswc8+/2ONB8c+WkAVa5iATRzICsnhaXkXk4E
+V55aQumKP34F9CDyoIG1x4autgUMxG6Hrv/WV18UcwKBgQDkIu1aLk7roVjYt600
+yf3srWh80zzmSWyzaQMDOh3IdgbVXIjA0ikK4b0zggD2cU3/9SuQBT1dFTRB7zp2
+pI2C4kNBNxSAd4k0OvTLaT8s/NcXGJvC50FQ13ocZeOUoUdpQ90mFToYoN2lwkdx
+qa3gE9q5LhV1yG55D8xvbTb6NwKBgQDcvkO2NqqUt4wJ3ZMnxzdAJTiwW7muJAQP
+2QBActp1vWHINy8EIDw1yCLHu7WBvc8qYTIDKVTXbRO/wWP3x5pqvw2XQKUhvaxH
+3Y48ox5ATy1uNUEfkuBi9UELRAVwnMUZkBm/LfBuWujjNk+e1uj1b9UnVFvgALey
+SGl8Rz/S9wKBgHOvZm7RhsGj6trSoWlgeHwZHyAVOg+I8i80NAvh35J0j1iIeOxW
+ZeuXtwq0hOpzYFtIJtP8ZDacdwhsWFgrb3sMY5BhbusKMrAiqVmwwBF/EU8r8mhu
+PkfRTKGz5SjMc9rkR/N01iYBBQR2NSZlJb+4MbSvssAsaCDJqyBh4HwXAoGBANae
+qqjzt6BGYQKKivPG7oIQbnCRjhOw8r4Rxvvib2LAUdzfQngpe0DzKFW3vH67dDuJ
+Kp4GRnX5mJT8y1xylkEpJmajtKn8hw+MaymrktMF6G7Zmkq/fCjauXXhmcRmt//l
+qhLF8JjrDLk06e7OlstjAwRtMbK2H+RYIS9y+qv7AoGALgIdgxlfnZMLw2HRrP2W
+AY3hwokGvwUD7GRZc+GHsdbKXlP9vgKYL/YURJg+EbPiROTHk44kcfiSlaXno4Pm
+gDDrRU1r2NG92OwDzZL1AcPUgReeHMZABM+XRYfa7h6e4Whq7ZUWPVxWW1VKqGvK
+pd+BCrHmzLFJhDJ2P1LfL4s=
 -----END PRIVATE KEY-----
 """
 
 let clientCertificateData =
 """
 -----BEGIN CERTIFICATE-----
-MIIDtDCCApygAwIBAgIUFdWnemty8vruo2ZpN67vgcxNlOgwDQYJKoZIhvcNAQEL
+MIIDtDCCApygAwIBAgIUeBiDWOR/D+D1DZhIGNwI9eImXI4wDQYJKoZIhvcNAQEL
 BQAwcDELMAkGA1UEBhMCVUsxEjAQBgNVBAgMCUVkaW5idXJnaDESMBAGA1UEBwwJ
 RWRpbmJ1cmdoMRAwDgYDVQQKDAdNUVRUTklPMQswCQYDVQQLDAJDQTEaMBgGA1UE
-AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0NDE1WhcNMjUwNDE4MTQ0
-NDE1WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
+AwwRaHVtbWluZ2JpcmQuY29kZXMwHhcNMjQwNDE4MTQ0OTM0WhcNMjkwNDE3MTQ0
+OTM0WjB0MQswCQYDVQQGEwJVSzESMBAGA1UECAwJRWRpbmJ1cmdoMRIwEAYDVQQH
 DAlFZGluYnVyZ2gxEDAOBgNVBAoMB01RVFROSU8xDzANBgNVBAsMBkNsaWVudDEa
 MBgGA1UEAwwRaHVtbWluZ2JpcmQuY29kZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDCRtVaN169jJsqZ7/oUndSKVBtII+IcSZz7KGSu6zgOLHxFaky
-NTF5R6w0b7TicnN0cWM+Fud7ywwp1PRNxaToPmemkpTpzd9LohDwg9wCqd5lM6eI
-R1+/uMuK1jZewS7sYymUuBoot3gA2ZLGEaatZQ1leo5iPStVm6Ali4njtiyXL0ae
-gznxDgRmdT2JWRJEq5TsjU3WLzLuDxVwgtLH2ChURwuCZg8Z04wd2kwRJk0jQ0ky
-cAs1UGiMN8F4TzLfPBkz7RL1IppaF5tRUCr00nG2nApeFWbYruebMMaroie7XAo9
-ujdLhLGoCNgrtccaWjPf4VZ0MzQhh5dQSw6FAgMBAAGjQjBAMB0GA1UdDgQWBBRE
-ZiwX8rGgnNQCR5KTI1L4Ra55ZDAfBgNVHSMEGDAWgBQhIxE/oCEjY0cLEbHJxfAp
-6JPr9DANBgkqhkiG9w0BAQsFAAOCAQEAduIn7LzBHCEX+E9GPjNxqODBPshlcJgq
-sCS0uWhxzSM5VrqZlzKvjdtTwz5BJxYGEqL67pCvMNPezRK5dM1sCK+BTXkZeOUR
-0I/hAmxmPS1LKZnqrPeELP5b/FEOHnQ91O+zunC8EkFzKpp+czzP0GNUTq46dHa6
-wuFGFkA7vFwM9B412vqSE8OlY/8vPyDuJ5UTjgaKI9QbddIw6EmIYyaaqAv69EVH
-ypRjyAQLysrT8sijI3zguLtQSwTO3u+Pr+pZC6tmNU+fPVy70ggcQh4WHi0UZQhm
-zXcvUhMFzYae02NmyOM5hip/lbnRxJW6dyND1L/f+bglG+wc6eC+Jw==
+DwAwggEKAoIBAQDl1r/Q/A32xWT6cqL7eCPERi6vNf3a20lHEBAu2PBQslPN4M9q
+6jo5+oNzOtpTNViG/aiP/OHTqDqgy2aSlX/TB6G+g9jga1JhTttkbXOvPPHqcJwI
+vjOkvusuE2YunGblQpz2s+vAtIMVYrOul4zNDX8dRJ5UIkWE9hzstz9ZbJ8Idrv7
+bGjf481HLomcpeZoB0s1L7A5aj3y2EK2OncFn2SknKHS4GlPlcSsiv8k+6JmTbLu
+kH1xoZGXWs/aU9bnBwfkYBL3FSl75iksMZwHAZEtzqq3tlFAQvhkeG5mCYZpyv8b
+MZRMmrxrHqNeXLaldgwRFLqwC8u3vMQ1i+QvAgMBAAGjQjBAMB0GA1UdDgQWBBRO
+acCi1/80y4D3DzW9IJK29eHVyDAfBgNVHSMEGDAWgBSc6KlODCHNO/uF1idXnmbf
+Cl5XQDANBgkqhkiG9w0BAQsFAAOCAQEAj+hs91BDbsjE8cZQQTR9WOFtReyEnBne
+ouuaaEER+BXUmHokLIiLVTy9GLjd8gufr7FaKUzJiN92Buq48YsGAWckDVsIiTJB
+3vJspbTAXbjxO1sr9eE+bPlinIKT0w759y9XLvsJ7qQcsietZjVSkVyFZT9J2bLQ
+aVONSHoQiHEz3ehliW2X+G/wMddJiVeN4jYi1mkwpdLEVduPVk0M6Meph70uO61Z
+M0WLyu07Wqvbipnq2/9HoBEySnu2JD/6WLcj2crOTb4umL/WEiL8W1xwBfhtdkHM
+gx7I4HCRr/j57YULiCDwqIs46YAJ795w4nBCu4DMxsZiH/zBcekBCw==
 -----END CERTIFICATE-----
 """
 
 let clientPrivateKeyData =
 """
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCRtVaN169jJsq
-Z7/oUndSKVBtII+IcSZz7KGSu6zgOLHxFakyNTF5R6w0b7TicnN0cWM+Fud7ywwp
-1PRNxaToPmemkpTpzd9LohDwg9wCqd5lM6eIR1+/uMuK1jZewS7sYymUuBoot3gA
-2ZLGEaatZQ1leo5iPStVm6Ali4njtiyXL0aegznxDgRmdT2JWRJEq5TsjU3WLzLu
-DxVwgtLH2ChURwuCZg8Z04wd2kwRJk0jQ0kycAs1UGiMN8F4TzLfPBkz7RL1Ippa
-F5tRUCr00nG2nApeFWbYruebMMaroie7XAo9ujdLhLGoCNgrtccaWjPf4VZ0MzQh
-h5dQSw6FAgMBAAECggEAQZ9dh8i2Nr6c1vkOiLH6XgVYhlP+R684tuWSOhcssNxV
-tsKDUVNIb9f24gtthSP1vbpjNGDWNimC5Upqby64oj4aEtjmdgc1Sr3mjOdtVHT+
-ix6kk1LQk9ke37m1ydHlQLHKJNL++wvl/BuCCWeC7oT4vnNkTuisj5Euyh/VJtYW
-h0HlOHt0kxiuqdU/ynxuQOdVUPT5KGZ4MCXHNWtapKanpGsXgDvQcweiqzgPBirQ
-svSOGF1oEYDqPt73sDl9nrYsZtS8hD1BK69eN5p1zcfinXuPWlpPTic3viYTTqed
-85mS7fWChuuxCijpZDiuw0+0LXjK+4b2AnEOtwasjQKBgQDlanmsMYolw9kj003W
-c6hZomOxKDzkkrQ29/l1VmmV9r1q7423by8k43Mqb8NXUKl+46we1LAK2xEnv9yt
-gDhIy5AhTPOSKyrnF+WQWu2Edbse7nOE3MA+8/b1I2ekBuRHV0PyoUOUs8+R4U+b
-+RXzHV2l2ZU4rvp8U1zNO6QUswKBgQDYyffTpEcFmWBiljslueDd2w4TtZPpNQ1q
-scBJtscGoE+exSx2yZebq016MrlurwzjLroLAS7jDKxyVLJturcm21IxaWVQQO7E
-jz4VGs4i5DCz2Uh20coq+ctXfWWA0KzwdoKSFUJwiYEEABs/ic6eHCib+xGVeCJe
-lOw/YHyb5wKBgGY8uxhnw17tFpmGk0uco0u+uJq8idZ7ImDUxZDq/4bbPLKpKwiy
-Pdo8mpgw0mbZBZAMuinLMuDDm7ORJzES0QJv5T1R48IiBq6R0bYxL2Q2aztvnH97
-ORlU85tvOcK5Z4X7d8Zq44kjUL98H1Qs/wEm9xLwEjX+lJZPOC4mBAtNAoGBANW0
-u56h+fVWDkMBb8sv4rExiT36qJWjW9eK5FCGYspwbCzKmJt8/PxTMSw+JrgqzhyC
-apoAj5T5YGHQhphPEM+4Mt1M1bf4WqffwUaSxxR0OGKC1sFy68XTuxVDIzWKAIGH
-gg258WX41vr3k+Td15Xbkli5dssOw2rTidSsLAqPAoGAVERDZjFnAPYM8pyT85ub
-/0M5k8HKgg85SfBQZs+4Q8sxG/Giwim2V6knVNvTWydBbVepNeh13tCT3/9sB8gD
-/yzuA301EheusrmaGq8WP7CITpQaKQva1CoH8slqIl482YIxI9v3Dpb9VcD65+Iw
-WvSA0FNqabkiyaEAz35lZWM=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDl1r/Q/A32xWT6
+cqL7eCPERi6vNf3a20lHEBAu2PBQslPN4M9q6jo5+oNzOtpTNViG/aiP/OHTqDqg
+y2aSlX/TB6G+g9jga1JhTttkbXOvPPHqcJwIvjOkvusuE2YunGblQpz2s+vAtIMV
+YrOul4zNDX8dRJ5UIkWE9hzstz9ZbJ8Idrv7bGjf481HLomcpeZoB0s1L7A5aj3y
+2EK2OncFn2SknKHS4GlPlcSsiv8k+6JmTbLukH1xoZGXWs/aU9bnBwfkYBL3FSl7
+5iksMZwHAZEtzqq3tlFAQvhkeG5mCYZpyv8bMZRMmrxrHqNeXLaldgwRFLqwC8u3
+vMQ1i+QvAgMBAAECggEAEcPHALayt5urQeZhbZFsJkwMaLOCIwvm/oyhy5UuAfa+
+nn+dWJSxGnEf/uSSInNRm+F4SWTQ6aSrn2kJTRQsFJoW6NxVA4eYDvhi4cDJ+8X4
+pte8X7qf0ECHegC62ahyFY9QBYuDkdoB9cGyxLBnDCRaal8246bge7XwJ2XEijtD
+ENRIZVx90l5MJASq3NE7890JqTFkOyyEGmWloBkyNL5EYfjnucU3EzTaA4GTmIoW
+jE1QvqHdXjUTI66qcC4XFYYY+1AUGDQmimGEEnMM3RH/6SOG5kbDUfESbGl2UJCY
+okqD5pPOEtr3Ew5nh7k0N28IjK7jVx0pSzXfinQbdQKBgQD2nRfIY8pG57QsIAS6
+eimGGnKDCsbGloW48iB0HhyqMC9tsKWMRUQ9dfGUWRWVJ2cuQaxTPonlyvmVi/cu
+0f+km1MBm99lD7R9bjWRNkMxyISp7gBmKEjgJARLhXWnUDa8Df3q908pGrFOZHZn
+GjHXiqmJKTL1N3R5nL8pJSl+zQKBgQDuljWgGKmT6hR3A35DmaZCLXCFCiOAqmkK
+lDnDo+0Q78tUtsy5L6m5KIJxjWvOgTJa56nJNqdApXI4TEotVWxQo1OsdN83GaAP
+QgTeNc4a/pbuayuifrdsrYwBUiRfu9hW74QXmOuCB693X9uT3gsv7uTfGfFi7AUL
+FLCzFAp26wKBgHhkdInVfZhj4Sdxch1/KepX2vNyPVwRe7KwMXu+f4vt/hl0lT0H
+S6sdexRK8ShhlhOU6AWzkCpojrOdIszuo/i+AyXT7Jkvs5NQTEJZ1S/mji1PDU7R
+99HEg3xC6Q8HL9Fam00r8q9EYq68iLkIprBs9xsIy+G+ctQz23bAt6M5AoGBALiM
+HdzBVuJgDQZmAFO/1NeZmFCAICgVKH0TXH8VHHmeUlQrtb2Eva7IQ+Ybswkf7Fhe
+m3lVuheKIgikEjhwvAC/5Sgfms1fF+zVbziGu+8rgInZAf6GL9FziDk5VYNrpJLS
+YAV0tq50zWf0EL+W4GZqTkS4J3wR/nCsx2Utmk6TAoGAS/ofmABSGD6181fzlfN7
+q9a9mxykbIc4MWOaiGjrutqmNdYwZG/UDnQO05oJY8700pxkWN4iuaF7GiR5ME3W
+s5m4xgLN0gEWRrAnNBoXggd0p2jZ08a5U5UAeRb3viRJjyd9CPlztSSAPMtAuuWH
+NHNYNGGPCb3FUSlzPL0Qjf4=
 -----END PRIVATE KEY-----
 """
diff --git a/scripts/generate-certs.sh b/scripts/generate-certs.sh
index 39938fb..5a8cb27 100755
--- a/scripts/generate-certs.sh
+++ b/scripts/generate-certs.sh
@@ -14,7 +14,7 @@ function generateCA() {
         -sha256 \
         -newkey rsa:2048 \
         -subj "$SUBJECT" \
-        -days 365 \
+        -days 1825 \
         -keyout ca.key \
         -out ca.pem
     openssl x509 -in ca.pem -out ca.der -outform DER
@@ -44,7 +44,7 @@ function generateServerCertificate() {
         -extfile <(cat "$FULL_HOME"/openssl.cnf <(printf "subjectAltName=DNS:$SERVER\n")) \
         -extensions v3_req \
         -out "$NAME".pem \
-        -days 365
+        -days 1825
 }
 
 function generateClientCertificate() {
@@ -67,7 +67,7 @@ function generateClientCertificate() {
         -CAkey ca.key \
         -CAcreateserial \
         -out "$NAME".pem \
-        -days 365
+        -days 1825
 
     TSTESTP12="$FULL_HOME/../Tests/HummingbirdCoreTests/Certificates/server.p12"
     openssl pkcs12 -export -passout pass:"$PASSWORD" -out "$TSTESTP12" -in "$NAME".pem -inkey "$NAME".key