diff --git a/fixtures/ca.cert b/fixtures/ca.cert
deleted file mode 100644
index c7176e8752..0000000000
--- a/fixtures/ca.cert
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----
diff --git a/fixtures/intermediate-ca.crt b/fixtures/intermediate-ca.crt
new file mode 100644
index 0000000000..fabec1adac
--- /dev/null
+++ b/fixtures/intermediate-ca.crt
@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+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
+QFTxy0SF8g==
+-----END CERTIFICATE-----
+
diff --git a/fixtures/notary-server.crt b/fixtures/notary-server.crt
new file mode 100644
index 0000000000..65f4818def
--- /dev/null
+++ b/fixtures/notary-server.crt
@@ -0,0 +1,67 @@
+i-----BEGIN CERTIFICATE-----
+MIIFPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQsFADBfMRowGAYDVQQDDBFOb3Rh
+cnkgVGVzdGluZyBDQTELMAkGA1UEBhMCVVMxFjAUBgNVBAcMDVNhbiBGcmFuY2lz
+Y28xDzANBgNVBAoMBkRvY2tlcjELMAkGA1UECAwCQ0EwHhcNMTUwNzE2MDE1MzM3
+WhcNMTYwNzE1MDE1MzM3WjBbMRYwFAYDVQQDDA1ub3Rhcnktc2VydmVyMQswCQYD
+VQQGEwJVUzEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGRG9ja2Vy
+MQswCQYDVQQIDAJDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN1O
+W2Vja3dtETKftw5aRL4fZf6WoWaBSGxqHNeQ6JrWHL3MYUhsLumJQfxOc/2/gWkJ
+3xkdBtL29dG3AcY43Dp1zKGbL7zYwJcceDyv7yy6UWDW3nAH/VZoyVTHsPVvzgKD
+HHi49DOTXdpQTpP2z1rOXq1kORpsgFIlYf0S3fOkV0wRlaDNeUjn9p4Xri5nltdn
+LiNHX3n+IdOs+7EmV1LVM/6saMuteFScGAYzI/eF/YMJlvilJbFiVPA3dZoOsqsI
+aP8ScoqIomi1E3HWdw3KatVia1VV/MGan27RK+bRqPVprib/YZfKKcENdaU9gjj1
+OEgJghp41ytlZmLmwGcCAwEAAaOCAQUwggEBMIGIBgNVHSMEgYAwfoAUFSsF1j0l
+AGXprgVkxMXJLUwxcCKhY6RhMF8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGRG9ja2VyMRowGAYDVQQD
+DBFOb3RhcnkgVGVzdGluZyBDQYIBATAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBaAwGAYDVR0RBBEwD4IN
+bm90YXJ5LXNlcnZlcjAdBgNVHQ4EFgQUadffqeYAj18Kd6GFlxalPqddw6cwDQYJ
+KoZIhvcNAQELBQADggIBAFLPPl6O/xLatVS1Sp4nyi38qYY3NZwMb6SV6/ql+cOP
+MOZxldf9Ra4MLi3qTTRAat9hqdqKVckTJPfQsH3n/4iXlw6RuItHSuVcsAfTqVkH
+Et/Gr+wn7KePL7ND6csXY2fPoz7wTZdSgjCwkihQBZ/NKoKVV3xLIzmnWxQCV0dm
+OqwbF2Ij3a06+wdrY6rHXRXK0p0iEUkzIn2TbRxLkSsp7EuEYi4Hy4t3M+X3+9W5
+aGxiMTkF0+vJiM7TdjBFYgQ45ZK5X9ctkRROCpmn7rLCojyWx3gephvAOxBKgDBN
+Sfz9OZ0SSEa9PAwaFgKWgtiGPpXnbDw28dgUKUvNE3LQmKviyYXaT4ZsrpDqfBbn
+58ojkZxoOr0yR40lwB+sgjbfaZZXRL48FmMgIdk1Lm1T7BWuC5YlF8YDNzP1GsIF
+WQKIWQSuZX/zFUVr6iuAkxiTUaPqTzbcX4AoKIBfyyszzE3Nj85+FR2kPaWBBOiS
+QPIzRMQwvtcXsyn2VQ0RnHGl0oAfB2u4ru6HQjeCLvhp4O6BZUC8F+bNn/OvEVbU
+/glwDCwf8DaznOwsBjgi/13rs+ssccDriXon94VEP98yfwfEb8iKX6yRmnUTvOpQ
+78Jtk4aiotfSOq00+ZLp0tDJKXZmOGd1Jmt60hI/sROGZGCbFXbS3/0heWvclXKw
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+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
+QFTxy0SF8g==
+-----END CERTIFICATE-----
+
diff --git a/fixtures/notary-server.key b/fixtures/notary-server.key
new file mode 100644
index 0000000000..91deb1e84b
--- /dev/null
+++ b/fixtures/notary-server.key
@@ -0,0 +1,28 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA3U5bZWNrd20RMp+3DlpEvh9l/pahZoFIbGoc15DomtYcvcxh
+SGwu6YlB/E5z/b+BaQnfGR0G0vb10bcBxjjcOnXMoZsvvNjAlxx4PK/vLLpRYNbe
+cAf9VmjJVMew9W/OAoMceLj0M5Nd2lBOk/bPWs5erWQ5GmyAUiVh/RLd86RXTBGV
+oM15SOf2nheuLmeW12cuI0dfef4h06z7sSZXUtUz/qxoy614VJwYBjMj94X9gwmW
++KUlsWJU8Dd1mg6yqwho/xJyioiiaLUTcdZ3Dcpq1WJrVVX8wZqfbtEr5tGo9Wmu
+Jv9hl8opwQ11pT2COPU4SAmCGnjXK2VmYubAZwIDAQABAoIBABo1Gkuyb1qQNvYo
+xdPUSsm9DCYPDoQGEV6NXmcEyRb0/ihX2Llr3k5Xq9HGNKQ7Focq3RmrP1CiYE/6
+fSJNP39IzffhWdDiVkRO4cpGB2vjkJmIOIVJ3O1rsVPx5fnayKmxfyCovnqRHA8r
+bXLGSp31TG76LGz9pmCT/ruqjVA50Jf+PvCTvcFOLj/hiZhcmJ27cskaA+hAKTUv
+8/77N8o7ZxhbjBDSOWJfQgECGCulUySzzLCs+BVxXMapwIfDlr/CCmv/BI9HNEZa
+xFChi3U8AXGTCvsG9qIs1X1v+jydJEaeXa9kcjNM743Gf6E00DTPMaNiERTX4lF4
+TAC3j+ECgYEA9nrVslbL8CC0V8pmBapT76U6qKnVPy2A8feGm9on3VukLr7u3IeB
+q55C4YKYhy16QFRAVxZ8Wr9o774QoquNfnhE5tlG7ZsjfLGxyRv3ty8exYFT+KIy
+0XITHmzETaWgNwAqb0K9AFDHRsBMowWSFhReuRFE8zRAcbLPXZV3ydECgYEA5dqb
+anghUqFs3WX1XJY2YzPBTTdRCp5bS7ieiMbj3V5t94CArQI5QD2ZwMe/pjLbdIxE
+zNCF/AwEmmaMUFNFc0m6f1e4b3OsrKxCGwVsWmGCKSbqkxbSO+5F10n54RraAR9q
+DP4dlOhwAeMIF0axemezNmVizpje3lnbOOUQvLcCgYEA3b2OKJ3bZNEXTW+hrvEY
+CB1ek0QOu4KlYYmsyONPP95k60UMQMuLhaigRJ6nt9zbAaqKI47wGvfeYOhdsOqj
+JabvXbsVC0epelGmPuXxShSTG14I/EJ3c2Or/ZAeXjhl1XVJt8SToggJ7wWrLHIj
+hceXm+kEXcOhQmh6E5gXJzECgYEAvz8J6ydzCm6XxwrrgRLWw+mvH1E0U/J4oeNF
+vSZHN8w3ESTRa6IbApF+mYFZu647HJkNMaEaqiFRvyot+zOd6JPi4cuaANmtRaq6
+AgOcKQNSqmzf5myplgXmBIBfseWGmEKMGa1h7aEMePVuqPc/+knIOi1XbfCSF02K
+cqddKrcCgYB3KGMoTXd7DVJnSSNee8g1t15QvOYm7s63mz6AvS4710tePmhhxo2M
+d+rCvYiMkbVm5v7g6m102Y6j/ugYz84AXu3drGcQcTgJnu/QRljfJBqn7PAiY0MT
+27dsJq4dlhyig4afH4UYw3it7JPg4N5j82HNUKI+3kSjQKeDakQ51g==
+-----END RSA PRIVATE KEY-----
+
diff --git a/fixtures/notary-signer.crt b/fixtures/notary-signer.crt
new file mode 100644
index 0000000000..f7e0b64409
--- /dev/null
+++ b/fixtures/notary-signer.crt
@@ -0,0 +1,67 @@
+-----BEGIN CERTIFICATE-----
+MIIFPDCCAySgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBfMRowGAYDVQQDDBFOb3Rh
+cnkgVGVzdGluZyBDQTELMAkGA1UEBhMCVVMxFjAUBgNVBAcMDVNhbiBGcmFuY2lz
+Y28xDzANBgNVBAoMBkRvY2tlcjELMAkGA1UECAwCQ0EwHhcNMTUwNzE2MDE1NzAz
+WhcNMTYwNzE1MDE1NzAzWjBbMRYwFAYDVQQDDA1ub3Rhcnktc2lnbmVyMQswCQYD
+VQQGEwJVUzEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGRG9ja2Vy
+MQswCQYDVQQIDAJDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKfu
+Hy43Sfmc6Aat2hp1A0+jLX27GRz+JeT5cdPwmwUg3/C4S4mEWQFfdCQ2mwHkYb69
+yswl2HN2n+jZASHz0N7/j1X7GfWPWhoZ+V/RG/RcsvculOWRUMlgNibqfRqAaQHW
+sI5bDonbQ8JyrV8xQNo0y0C7asxXyuWOKSC7ARQv52B4oq00Do144pxYzDOq85mV
+XHDBJbgfwpw9BbBMiVm7DwFPOJ+SIrKMc2O+YcgEyelW1BuiWo19HAJJrkN1/9/R
+ctYhrdm3aGiwiLibr4UFQL+xvBWftSkB5j81o18hsUXIK2IXpeqDkyR8Ac9MjUjE
+ki5BKMalCSCGeuW69oECAwEAAaOCAQUwggEBMIGIBgNVHSMEgYAwfoAUFSsF1j0l
+AGXprgVkxMXJLUwxcCKhY6RhMF8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGRG9ja2VyMRowGAYDVQQD
+DBFOb3RhcnkgVGVzdGluZyBDQYIBATAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBaAwGAYDVR0RBBEwD4IN
+bm90YXJ5LXNpZ25lcjAdBgNVHQ4EFgQUACymnr0KnxmVxMhUtsFhXM2GDfgwDQYJ
+KoZIhvcNAQELBQADggIBACUrOpLFf9iPoivsqkyr5oDrSczmR2b/LN6kKc+G18ux
+TafCC5X0WxguXmcdIfAs4eLpbPTwoUUj2KQ9aj1D33uC6q8acDe3jTkT9B4X48Zk
+zkvvfF4bLYwMf3c0nzOI/trH82ney98IEsF20rtkDrzDpkN87sVmCPpWRsEdmnqd
+BIE4uE41ZmaxAtT06IYsNH2NLQnuPSuIueX76442G5BzJvN3qioOOtE9D633vuWf
+sQMYJQLOgZRNOuQ3zCzX6aT2MfhEbQyoTiKCZPDFD/ikDQjQ6s6ahupCcdg2IUHs
+luGCX/0qqo4JD+ROa7Y7b2K3iwxdgb1hCwlCGBMfK4es0dN1VUxHenGr1S8NE/CE
+eYt4Vv0M9XAYez9OOQKjYRP0u4s+y+KIZ1Gvf6SoCZItzNPcco2jTN+rf8JmhKee
+yIsoKEU+PTeBRhXJ85ikZRK66LNG6jLupKTSkU+DD/Q48ryWApLuy3UW3aAbVr90
+Vhiko8UgRHRJY4fwJUknUTQxRJFifjMsQtBhJGfFDfR3PkKY8cG+5kLonG5nwtEj
+BrsBS6NKuqLjRucnH2qvihqFH1PZoemaCyfcwkUUC1UbTVFZc3oDEeKYnBoXD3Eu
+lqAR7+qCl1NOPzHSpqw2BY68HJAyycK+rWsyDW9IyRO6Qs9CBSG5FqJydh6QkUYn
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+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
+QFTxy0SF8g==
+-----END CERTIFICATE-----
+
diff --git a/fixtures/notary-signer.key b/fixtures/notary-signer.key
new file mode 100644
index 0000000000..e19062d6d9
--- /dev/null
+++ b/fixtures/notary-signer.key
@@ -0,0 +1,28 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAp+4fLjdJ+ZzoBq3aGnUDT6MtfbsZHP4l5Plx0/CbBSDf8LhL
+iYRZAV90JDabAeRhvr3KzCXYc3af6NkBIfPQ3v+PVfsZ9Y9aGhn5X9Eb9Fyy9y6U
+5ZFQyWA2Jup9GoBpAdawjlsOidtDwnKtXzFA2jTLQLtqzFfK5Y4pILsBFC/nYHii
+rTQOjXjinFjMM6rzmZVccMEluB/CnD0FsEyJWbsPAU84n5IisoxzY75hyATJ6VbU
+G6JajX0cAkmuQ3X/39Fy1iGt2bdoaLCIuJuvhQVAv7G8FZ+1KQHmPzWjXyGxRcgr
+Yhel6oOTJHwBz0yNSMSSLkEoxqUJIIZ65br2gQIDAQABAoIBAEeXET3fni7GwHfQ
+d9Gdnsq9kvAt6hfdFQSXfvpOcZfvGukBeFpozJT0P4wMp2pYFX9+Y81COROIN8XJ
+dV0nFx1qL44FHVz9Pvkvp4s8l0FGn5kXB60SlTE0TgGrJ6g7pAh/oQcfNIR6sFle
+ECEr2yzrItc2zuHMb5gLUec9McmLrWaIUicp/9kMHjkMn03n+cGhMAYW+CEdy/k1
+c7RLHonb/Z4+PEbwkfwF5MWr9QjDi12iNoIRx7UMebvxl36diOyvXM8aRSrdbhEw
+N4rgL36uvGsdOi0M8oJoEPUAqVGkJektqtHdhnGdJPb+8fQGXrLapFuVtiXYGlzf
+CG647BECgYEA3HzZje0zCY/W1r5LvBr9DkfMxX0sVLE1Q7DBMv4WBh9J9brYHP/h
+5BIuHak83WZo2V7UvQoR8UXtzLDEjt9hc5+BDE3jxdi52YAXKvpvCGx8wVmerYlZ
+NmkMp1azLUZhiQCjM3n3pACFm93Ks0LQAinw7Ovb3fPVC6R6sR+gDlUCgYEAwvo4
+L3uQxARLb9m8nC6REpi4/RGNjru1UF9oY7WRcirVKVg+EuF/SdO+256gPiREltqO
+9BK+VAOiV877xvC6sTr4Mdd7LPGVEOoGoEhMGJslpfK1aQAxbLbTmLZfyUh8EDb2
+17/g9uYoF1zw1Ud1w/bpDp7bZ0mKvq7N77XNG30CgYBhAcUt/mhwEorxXDQyBKXF
+vK1JTnNMp9LJf2DhMI08EFQX+ybOS351O9JyVl1jA4Wp7WEn8uBGCQBBCJzSR1G2
+7zx1z2chSuMp4INQ83IagLC62NVJgJ5xo/JfRXP7vXV4M4GaSlU8IMan9wMRr5mY
++h73/iV0F61qO+mHOGTRKQKBgAWrpUqsO0+YGGGOYY/hQtLZojep9QX7q5BE1hJg
+S3SYjk5/hH6kFEGfaOOWP27POzdv78xlZyemW2hWWrg0dBmHb4Rzkd+CvyUYyUyM
+DbqBeJzU7DW7jbRttMWyOCLwers1/gPUTsSfePcE+vQY+fHTEoAcWqEsYF6fUtnv
+3aE5AoGAFC60XF1kZBqSgPjeoCT44hGkd32aNVZtvhlHsmKOrBlWuWPXdh4S54dt
+FvgIZOw2rlhFXAHVFzDqj+YG3M37oLqssafAwwCW1IKlTKHXuNrg+Jbr20cv/hmy
+hHKXPDPRNEqhyuQwmTGnKFx2MEnwz32TOs/QRMNMzKe0BaVeOL4=
+-----END RSA PRIVATE KEY-----
+
diff --git a/fixtures/notary.key b/fixtures/notary.key
deleted file mode 100644
index 305f9b8c8f..0000000000
--- a/fixtures/notary.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA8rZTAVnXsPwzy5HEkLUJvKjzVd24ZGUTEQLU1V+iiFdQUBSV
-VrUroLKXtvM7FLYpm3BA7XfEraTPsBVBJ2NgbLbA1//mkFkbQd4nJF8ugS3a7knw
-Mto2UylGn2WW36yeUI0ZRDarEUbMqVZVECXdkdZyIuFyTN7zDKduguHCw89pzP42
-4J+QXPpewT39/XByJ8ok557cY3j3z78SFOfFf4lnGsuIdumVy7AqhubsxJuadsSO
-udpAb2ElZbpHNYXgOq4yhry7EEZIEbfVGAiOGUoMFMrqgLQDUJcrMrIdFiNleR3x
-v3w2euxMbZfOP21lWLTSBhJEdhZ7X5F/OsgqTQIDAQABAoIBAC8xYmxl0rm4ID4Z
-5tWYTf9f/oiYpwzmVlG9cjLW+Jx4FcasaelFKumBMFzDaJ57WRW/OvCxlA2LeVKs
-n1GQUiRxWIfnWyaAHPuuvX+l/j3h86rXt5u7sEp1QSUnNLHjN5lEBkCsPJEMaikW
-/003f6CmyOSdX4Mw6qNwPt22Fg/KeLh58+h9+9ePc3HoILghuHBv6X3Fi60OWop4
-zszzOerNE9NMRk96XUL2PerXZMpQ0kq5iiDVLBEN3XcQjaSdw3G/rih+wcEyE8U2
-FMaLPNtscRvmeKke+TBQvYKLThj9wn3GkCAFu9e3e5ByE7SQzeB+yS7/rJz4RMuN
-pyDrHAECgYEA//xnc6dZRkN3mLUM82FPMPp8RWymcUH7vq+q+NSmnrI9gZaQ/C1O
-WYXQp8LCHLBMR+4rtzTKD60buY7H3RdaFmljEctpaog15nEHWHDu+pgHMkiE62DX
-i+DaK+rS6Zxyr8hpd2KwXUEEh0rN2QlGf2zjYjL16GUa0+Zth4Ini00CgYEA8rm7
-0eZyqQ01z5AWY+b+lrwc9OHJmd3tfbv8XhUU6tBzXBjZOPD6bK6W3qdZbzvfsXH/
-8aYQbv3RVXtCHYNp7IBzcwO/6cZdYovHfVfjC5tFXxCGl9ADUDdO81yrDlgVXkpT
-+F81uQOEQuW5YYqEd0hRF3m8UdkTkLxKYpXtmwECgYEA6ELUfqw9pTH75pOHX6BQ
-IQl1DeyqDCMpTnfHMiSH1X+1rMm3XQeiijmO+1gLlcokPDOOeJkuKREREcjJ8QGK
-HMGcQP4F9MIH3cF6P7WgL8EW7nm8GHDywZjPe3+BxLLNoE6/2rGxgbtHZ5Xotd7j
-lyRuH6BLXIO31sHBaW0fghUCgYEAsY5ms4w1Ui7krzqC9n+yuwdO02Abvp/WrASI
-/zXCwGbODI/szzeQqVIp8SRQSwtsfnybMuU83kR0DmkFG1vXb3cjfP5AND20cHM5
-8hoJb6Mc4wbOvl0fH13mNiYSx4Jt1zTeKjFTtky5QsqTiqPudOeE0nxt4x29r0Hd
-1DJCxwECgYAW8MkvwhwcmQ+oPu0G3xGC3CBNtwtCFOPkf6Gkf23yPWg3u9g/81wF
-M4QxAkLtdvI9Pe8MF1jKmrk+1oDgM0d2SB6J0HrA6eu7KiOw//WiwlyDs5sb9CAb
-jP4qLOGfMXq0p6GD+DSlwzOxLT6V55w7k/EzswgAnhedUESPkUn6eA==
------END RSA PRIVATE KEY-----
diff --git a/fixtures/notary.pem b/fixtures/notary.pem
deleted file mode 100644
index 6dfe1598be..0000000000
--- a/fixtures/notary.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFJDCCAwygAwIBAgIBAjANBgkqhkiG9w0BAQsFADBZMRMwEQYDVQQDEwpFeGFt
-cGxlIENBMQswCQYDVQQGEwJVUzEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEQMA4G
-A1UEChMHRXhhbXBsZTELMAkGA1UECBMCQ0EwHhcNMTUwNDI4MDEyOTU0WhcNMTYw
-NDI3MDEyOTU0WjBXMREwDwYDVQQDEwh2ZXRpbmFyaTELMAkGA1UEBhMCVVMxFjAU
-BgNVBAcTDVNhbiBGcmFuY2lzY28xEDAOBgNVBAoTB0V4YW1wbGUxCzAJBgNVBAgT
-AkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8rZTAVnXsPwzy5HE
-kLUJvKjzVd24ZGUTEQLU1V+iiFdQUBSVVrUroLKXtvM7FLYpm3BA7XfEraTPsBVB
-J2NgbLbA1//mkFkbQd4nJF8ugS3a7knwMto2UylGn2WW36yeUI0ZRDarEUbMqVZV
-ECXdkdZyIuFyTN7zDKduguHCw89pzP424J+QXPpewT39/XByJ8ok557cY3j3z78S
-FOfFf4lnGsuIdumVy7AqhubsxJuadsSOudpAb2ElZbpHNYXgOq4yhry7EEZIEbfV
-GAiOGUoMFMrqgLQDUJcrMrIdFiNleR3xv3w2euxMbZfOP21lWLTSBhJEdhZ7X5F/
-OsgqTQIDAQABo4H4MIH1MIGBBgNVHSMEejB4gBR233eeV1v6NtTVfho+G5C9LAyy
-s6FdpFswWTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4g
-RnJhbmNpc2NvMRAwDgYDVQQKEwdFeGFtcGxlMRMwEQYDVQQDEwpFeGFtcGxlIENB
-ggEBMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MA4GA1UdDwEB/wQEAwIFoDATBgNVHREEDDAKggh2ZXRpbmFyaTAdBgNVHQ4EFgQU
-nm7GapxAmZX7G7aAU3dX9qs6zuswDQYJKoZIhvcNAQELBQADggIBAKiGuAZHmp0Q
-i/mDsNhsyGpQ/6rTHrUuGjkH/zb/LClxe+TRMDFy3HKAdk3I+0ixy+3nI/3uCjqB
-ZizhoAi0/qmGDbNqnEuMVvN6B+hcYDLMO9YZwNtuT5l/JgQMOLAA7wMmbnoH6fWn
-o7eUI6+5Mu4bswE4mmP5HQCJb/ex3/tDVxmN0BqKrCbOoLBOEetM+HwO2V2xcbM4
-AF3MLDiAzCss80S0p4V8BwriKR74iHMeLdA1XnOGMMOkcdx0C2AO3UKlqoJcYWot
-n6Zb+yRS61ukuw4DowyUOaUMrnVBS3NW7mCPPvKZmC3MwJWqgA+0EsNn8ph/EK77
-QFUDwYyurIZ8oMGfLjV8i/u0R6GNMPSs184BbHEjxVrIPrXVk0+fCim9LWAYuW3h
-+iwNu82+E8JArv3LxmIVJenzAox2gqmCj9uc18xHNhCwRPEJzKt/rF0qidjwqF5Z
-Iz290bM7Odo03knQFSfS4xAZAYVPtM47liw9+5TDt+SOG/VsbjDRaj4IheSazdvw
-ITr4zki3An7SZC1Y5Lhz0cfHUJWSHsICBMkpRzCWIRejQ86S/r3dWvqWs0m2+Pe9
-C4x+l21k1eNsg5/l1lXfPNYTgLbCNyyfF5veDjAilEZ5W74g6z73dYI9QA8xlAlg
-eYcNsiJhKNNJC3EGw4lEOUXpxO8Jozne
------END CERTIFICATE-----
diff --git a/fixtures/notary/ca.crt b/fixtures/notary/ca.crt
deleted file mode 100644
index 4d85ddc091..0000000000
--- a/fixtures/notary/ca.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----
diff --git a/fixtures/notary/root-ca.crt b/fixtures/notary/root-ca.crt
deleted file mode 100644
index 76f5bd029e..0000000000
--- a/fixtures/notary/root-ca.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFdjCCA16gAwIBAgIJAJkfZd7RGdOfMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEPMA0G
-A1UEChMGRG9ja2VyMRIwEAYDVQQDEwlEb2NrZXIgQ0EwHhcNMTUwNjEzMDUyODE2
-WhcNMjUwNjEwMDUyODE2WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAU
-BgNVBAcTDVNhbiBGcmFuY2lzY28xDzANBgNVBAoTBkRvY2tlcjESMBAGA1UEAxMJ
-RG9ja2VyIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA199B21aO
-5qkPxCW+kSVlTI1mJfN3/eF9hxOn9XH1ChIw/Bqy0jjsuv8a9ODvCsiaz3I5D0hR
-4n+2Et8R03Hz2oOQiinaPXzWrtitfVLUsm3hxwGRSo1QT0J/5ab+6u9qE2Igj/fr
-CKyVvcAIFi3u/Ow3C7eXhQWWpuuiTYXuDCINxcHX7QOqywT6qB1Dq6CxVxP4pU5M
-z01o7T8uOu1uvFlK33j4dyg0+IIm6Bb+z4fm0khLNnGW8DtfEcVbmIWoXbatvm+W
-auzo6VOtNlzuyE3KMEiJQndnVO1TPgCQI4ymL2BLIPZz15NWOqORFkoNah1LV39W
-TKYwL22f7m5mZhzTL256Fnrgt5ZZPrqEbu61Eq4MvEolCFX/Hh5YQyun6irnWO59
-1/vdI49q3fDUX1wLI+TMWWkL6ySYL8U+H+S6n0un1TH34thzSXCEVyQTUwgkvdOu
-aAvRVxwpovD5mv/LyxoeIHXKs0RZqFP/MGX3FwcU/2Y//50tS+luUM2ZVh2TOdOR
-KQzWZ6YcDjWb1Q6GQBJhDOnLhflM3Zmkdmov5CtfRs991DcBTAm+E++VLNtaQGzw
-EeN3yf3U+zTzu8OE87ysNazhCshLtCLL7BKeWzJZaKrukGNmt2dsTaDtLICunpMK
-ToSiwwTDIexR1hweeFJNYacSHbTArajDEP0CAwEAAaNFMEMwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAUYwHQYDVR0OBBYEFF/dc3KuBo8Y5u9vluze
-o4sE/k9eMA0GCSqGSIb3DQEBCwUAA4ICAQDLzCkXowDweWWxwVC1tEzQLuWuGbeZ
-UC04ar7EwnpY0SFS8YjoKVseO8+ecsPEQZ7tw1gscMZH9UW9bZUHJr1XjJ67aq2d
-pfN7eo6Szl/Iitkwkfl0TWVyM5Q8fiH+yicOaXrw/0zEx/z+rMm07tqB0p0okxd7
-crlCGCw+8OKsTCmg21x1tCy/jw5sr0rUa+pXRyjHXRF0lwPuaRi3PdGDa7gflC5x
-Fn0k+JKa9z4QF5DGnz3oMl0sR2F1X9KapT2+hc9SxiaGyrSEmazZuV5tH3J05qZU
-+amr6YX5xipqecybG6muvegtCn8ww/vBvTb46swqPuiVmyIO0m08K9/m50+lQf54
-54xLvGXvN4ARsGyL3o6rMnXwfPlmQ1imf4rplGWc96a553KQT6u9GPrsgSGqZLil
-JoZZZonyj3Iuon1QYhkkzfzzWyz8pLKYR8/Gm1KKrg5ku57NtRXa8WW01aayUI5u
-2NGHVi2Bk2Yepw2tBqjcE44ESnnRyAhjJZEUAYijjQ5dwqKYaO75sQQzTYvWGycT
-2I2b2U2uifWJvvroxf1ARnkn4n1lFB3VCXnh1kETfdnh8IScBhlhJaf+BPwF/ppU
-LTVoeder8RYlbzxzKdubR6nj79h/ww1TcyiJqkp+EWduouS1GPQyY54BlPdnLvec
-Ns20srByc59Ipw==
------END CERTIFICATE-----
diff --git a/fixtures/notary/secure.docker.com.crt b/fixtures/notary/secure.docker.com.crt
deleted file mode 100644
index 8fb27de812..0000000000
--- a/fixtures/notary/secure.docker.com.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFMDCCAxigAwIBAgIBATANBgkqhkiG9w0BAQsFADBXMRIwEAYDVQQDEwlEb2Nr
-ZXIgQ0ExCzAJBgNVBAYTAlVTMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ8wDQYD
-VQQKEwZEb2NrZXIxCzAJBgNVBAgTAkNBMB4XDTE1MDYxMzA1MzA0NloXDTE2MDYx
-MjA1MzA0NlowXzEaMBgGA1UEAxMRc2VjdXJlLmRvY2tlci5jb20xCzAJBgNVBAYT
-AlVTMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKEwZEb2NrZXIxCzAJ
-BgNVBAgTAkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6eU6sCT2
-i8u57I5VLmpa3Hq1Vbkd5Xhn1eeLOhTuYZ2mPdmvDk9Ro1Kiu5bqrckSNJccgqo8
-Ai436JS3/i1Gt+LkcYMYNv2ahezT3ID0fVzx4Ow9uDkxSl28FBIRUO66itjWtEF5
-ENMDmHkRp6+BhZ+Eu20OQlqtGvdO5azBYQAo19JyctA0pyU7o1rAVLllDGdCMAc1
-HP6ZsdYYIi8jUGLYloGlUq9AIGmkAQoM9APxvLANPm95iQwPB1Orm9x6vBAFsKBe
-/Q6zW6UKziBJwpAujKPkFMe1VKXTZQZgeNSFQh7QMJUJgR9Eu0pSKKZf8W5xpCXq
-dpL47pvdNNSIAwIDAQABo4H+MIH7MH8GA1UdIwR4MHaAFJZkZZH1bZHSIMIvFatZ
-BWikVHRXoVukWTBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcT
-DVNhbiBGcmFuY2lzY28xDzANBgNVBAoTBkRvY2tlcjESMBAGA1UEAxMJRG9ja2Vy
-IENBggEBMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMA4GA1UdDwEB/wQEAwIFoDAcBgNVHREEFTATghFzZWN1cmUuZG9ja2VyLmNv
-bTAdBgNVHQ4EFgQUt+4JSPFbGr5suuQ+iCn1WW4KcVQwDQYJKoZIhvcNAQELBQAD
-ggIBABGUsCFrA7fuXDrMplTD/QXCJ9znsbkoQm9vHI8MJ+A6xx1NhLO7ErsnN4kf
-L2vwjGs2bv5lZB2OFCDsAhLe49OQg4gOcvxt2urlpb3+veaEbcIicoXgwBYi6ayI
-KqVEOggK06hxaqXZuxw9zeFNtzHfD8HMpe+E1uHDt47EzAbFi+pvAw26sBL1lUgn
-5MElV5BrigO6AgiLuueF5omXBU8xVbmSXnvlTlAO5tbBexeIm8L3iFJaxzyuZna/
-1LTUvBbGFK5IZWha6lisP9I8Id5Yc42eolTA2SThdP/H4oI0nWbHxPlj0Qkbhuaj
-3zVuybJNQP881T7AQ9DdZx1fb0RWzPYNs2lVA8Q23RXeUBOzPfdD4Xo3dpZc/DR7
-2ibtx2qo+ONqsQbMPIfBXYTNPwXcKwXAOaPuOIfECyIAik6s8COU0RprImMASS9R
-kpJKn+1S96j/J50FKNbQyzJ/5xWtl4FofFULx0SoHN9sZvOLmCMVyioR+qmoQg2X
-OGcqJFqExZtlsDaM+q9PbK7J5jQJuALqCI14JNHt+3Ic1vII7uKRUq5x0rz0J+GJ
-I4ZPo0Hxzba/X4dSVNNwaMcpcs/G7qXKVYHEyDOkh5MGXVSkhmGnsJL9jGgRp3w9
-Whe7YpsTs/IEzO95FHevp9tV7zUNaWdlUnLHpP4vPa6TIqAG
------END CERTIFICATE-----
diff --git a/fixtures/notary/secure.docker.com.fake.crt b/fixtures/notary/secure.docker.com.fake.crt
deleted file mode 100644
index 79b379f43a..0000000000
--- a/fixtures/notary/secure.docker.com.fake.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFMDCCAxigAwIBAgIBATANBgkqhkiG9w0BAQsFADBXMRIwEAYDVQQDEwlEb2Nr
-ZXIgQ0ExCzAJBgNVBAYTAlVTMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ8wDQYD
-VQQKEwZEb2NrZXIxCzAJBgNVBAgTAkNBMB4XDTE1MDYxMzA2MDY1NFoXDTE2MDYx
-MjA2MDY1NFowXzEaMBgGA1UEAxMRc2VjdXJlLmRvY2tlci5jb20xCzAJBgNVBAYT
-AlVTMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKEwZEb2NrZXIxCzAJ
-BgNVBAgTAkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAybT1thiA
-QkOMWryr75Jo0IQfaB8G3NWjtxu0B8z03wAEJ7R8+YL+CAxJCID75JbfQOUdKunR
-Rl0sL1KPxGBrdQJcy2TRzRCjNWlVc1xd0vK1wOLcXKJGEkHS7xPb1JWOcvNSsYBm
-JZyrspXaZ/OnWgnwJWjzxyAwnH8ITpoXH2uFKTzZyEIvdCEnbmTaQSP19pRCN8zh
-BXb6VSaq+yRCx/3G9ewArShN2bQKGJ4SOuBqIKZX0lO30Y7+vj3smqYyA3ZjB7Zg
-rKWCnmVhaMXKZ6CSvUuRkzMNdFgHkCWHWP3jaPQqK5u4iqT9G91hX+8Taw7oEVa/
-WjRt1MGS4OGPHQIDAQABo4H+MIH7MH8GA1UdIwR4MHaAFHroqCxydhCriGa0M39K
-YhQyxnqRoVukWTBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcT
-DVNhbiBGcmFuY2lzY28xDzANBgNVBAoTBkRvY2tlcjESMBAGA1UEAxMJRG9ja2Vy
-IENBggEBMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMA4GA1UdDwEB/wQEAwIFoDAcBgNVHREEFTATghFzZWN1cmUuZG9ja2VyLmNv
-bTAdBgNVHQ4EFgQUNWMif7MEZO2/9tMpN2Viz5qBhoMwDQYJKoZIhvcNAQELBQAD
-ggIBABgCalHFDScXNBbfQZmsvRIkRtASLCZdlRz0vY4J3WB4/AguCRInPsapTfcE
-PaI9Z5yjU1esnbQ3ttkg76s4aYTP7ykSDIud/otbgMrtZKMQPDac2wNPIWngZQuy
-yo6UFqVQV8PMg3oRmXneNgLOV+bYzlNXSbbtd5DmFKAZAXYX+b7wVghoZpL9Q6Jb
-rnf5DN5ggCUKCn/7bdzklA5gHw2JkQeULUrINsH9RacC8g0awQ7TtRRgaeDQ7Pco
-nUyuSF/w4KCayJcT4jcLZ5yWXJBj3Txj5881/8G92Fu6KMa4t2Hj+fa9vqH76xwM
-mDSoKgNHquV3h+nMpg5Cz+Zzb81wnlk2bVLWsnsatGLUl22/+GjLbumc3ixPvY5V
-BQ76Wztdb9oaqDJwMrQh0KnKwJSWmPl9WKCdPdRz5OD586oDXKfELpH0MqE8TUVO
-QZPj6YDTBAAQdDCwNoeH0EGS+JteUW+Buk8PyILJSEUKtxRfRQf48atGW3dnOX1Y
-NLSSOmjZrToD9MCEpieDndyjw3+xE/fgsHSP9KlyGuRY+j6463GSV+3qbowy8aNh
-41mW+u9EVxkCSEaetXZ6o3PATc3p6DNgHsTreoMo0UPWybdIDogEWYD3u6nuRFDn
-hPoy8jJLnRCpY+mkFXE02zhBKzkz0N4yYx3bdAzXYtNsCgit
------END CERTIFICATE-----
diff --git a/fixtures/root-ca.crt b/fixtures/root-ca.crt
new file mode 100644
index 0000000000..8c50f02826
--- /dev/null
+++ b/fixtures/root-ca.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFhjCCA26gAwIBAgIJAMiVQcxLXPlAMA0GCSqGSIb3DQEBCwUAMF8xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0G
+A1UECgwGRG9ja2VyMRowGAYDVQQDDBFOb3RhcnkgVGVzdGluZyBDQTAeFw0xNTA3
+MTYwMTUwNDdaFw0yNTA3MTMwMTUwNDdaMF8xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJDQTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGRG9ja2VyMRow
+GAYDVQQDDBFOb3RhcnkgVGVzdGluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBALmWQJdgSAzZG3jXPeO5NNzswzB2vHgsnU/MNmNXQEWPdk0ouopj
+yciIgpeFFibE/f0MDX6VY0b/nPIQa3ooiltZPAYpftWwfRB+beaAfZ41IfPFXCSJ
+UYs2ac8CAN+vFQiusT2QL4mz+wKgLa77/EC2JfCLrg8aJWh1jro697EQU4Q6mgtl
+e+4JCDOxjAiajrkwWNDyk7zkqA+QXex3CbZNB4zUgwtV5jmKF69X5tICKG62Y62z
+rxZ9LsnCY3lAtFORzE46x6clh5p+HvcMUWFU2thLROze3RcIl2v4Sv/ryfP+sMnb
+ZpxdTF1mjvBY/JcrFTGR6lUft4dm8fv6Ru219d7X9W/TyYJbXP5TVMjlFOUQBP0b
+pQhd5Tq9qDCpC4YC+qTupfSrGQE+sqdjq5oOIQf9PrwnLQwrymOZ+KKgsL8KMhKW
+VFZmcxUyDxHlIASu06BXK1ueGC3ExLSk5rpXGNMo/sjSVh1KOeF22uhjfuYjH1nv
+PVjlnqr0eKu7vvP2OwpZyVmbPcLyNRiZHXJumbqmo7u+j96a8lKqmX9GL34SuMdS
+ZwmXLOy1hzXpY7ruBbdlkjdHSgTtf2AmpQrBuG1o31D3LH+aN06rbpqYMLM+krNx
+DOGbDuP70Oi+bxWwXEM9fjRvsOw1q4bB6IkAaS4UWfsZn0Yw5RLNTFrRAgMBAAGj
+RTBDMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgFGMB0GA1UdDgQW
+BBSylZKvHeNVM9E1apkIe2Cy0tpMrjANBgkqhkiG9w0BAQsFAAOCAgEAmbvOb9Ye
+b40Ua58URkvFyffQYrNGXQYsv9uAES1tfBu3czjnaEQoKfD8l78yCJfhvhaFQ2Ym
+hax+xhS+kH3m8wa9gHSAp6G3utUI/B21eRwnKhEkcZXBJG03HLYlMG/bIMHXzaJy
+AsSF24LHp/HMy/of15o3rZ2YGBiW7U8XMAM8X1iABmAoRZ62n54FCuuQ1kfCFN4p
+sQD2APchSqhE46crBJxyeihZB+e6zwuLqa1UlpYMzsr3TFfObVfvwYZXVkjddtbt
+nzNZrCPZ7TSXFYiz4plPJAS1PlkZlsndBl98AtDZ52Uke5dclEzdHWrUBjV+b/VM
+pB7xVq79NxkW9IIXae/7GLI4iED7d88Q865e7X2san+aKKS2rA69rxwQAa9ntoTY
+ok5lmbO7nlFSuuH4ch83Z3ucdZpTK7c5PtqrKIvgEaFk0apQz6wa86h7rHmw3zNA
+ePXNcdByJYK4AEPSF6nDajeJjfLg60DA1ORM9CYf7I4V/d//diY1C8rtOpjHIO1e
+9IzAmGb2qcLKrq1kLEK83V9Fp7pVTYSBF4oU20DGVyKdBnlaxjNBxxQWgPgrnoVn
+vxM6y5F54wGN+OX0ls+z1gFges3oiFaMiMarhd8ozQupvlDYWB7EIpzEwd/2Knhi
+qBmsC3UdVpQLhdgyHdwQ904Q5VjcN8/kNyM=
+-----END CERTIFICATE-----
+
diff --git a/fixtures/rufus.key b/fixtures/rufus.key
deleted file mode 100644
index 9b3a032f73..0000000000
--- a/fixtures/rufus.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAtjV1orRtFazywT7ueDSVB3KsgFaAOUfhtyk2upTmvF8vg+6C
-47zCzgkPLiELBdMi93jP/86Osnud3zGZxLcb+rdP1SWfGzd5QeLHwlM17NTYLhFc
-6nFzQozKWSZlZGQeCPxpynSSuGHS9qIH+bgqmrWQSc7nz2qsqqDxO2yX9XFJ669O
-OIK3zIroCzi0ElOluerWnaW0430IWk4ykPWUyGYtwsdW+vHIqjXMgx0dPkQParpH
-kDsCSbUYmnsK0PUmuuToIaTX0yR99FJZdnPOprwHWTqOe239Xbnmb6QX8qidXjVT
-J+FFJwWBMHWd2Z5wIs8+7oTKC8r3tWea66IhaQIDAQABAoIBACNLkcD1wFe9i7yh
-SyJf1Sp/LSkjGG2AHhoT0rUr2NJOge7FifdBfl7Y5GbkIbV8I77aWThNM9khFwDA
-I/A2JCZZ0g4Q3pQwF74KhvV+luiMhl/OHziOx2vxx9SjGmrq9eJ5uqhsEmvDD1GV
-K4RVB3O2jf+uI7tLB615xaDkNT9m4d/cDLW1drP3RKXO9LJt290NfMEoyP1018Gi
-rEAnkyG9JHDeXGOCKCDDw0+tgNrhjiky8hmakpd+/TmCP8QEeTYC0n7W5vDn1jFb
-1nLW9x9dQxWoRVW9kfQDrOeGlOvmbvVIgoU9aFmtOF0ys2l23iIS/fkFOVtSmxO1
-/d7TAY0CgYEA3PYdIau1sfLOzCRUNiW0O/EubZPWDWCcX8bua+YDtZHU04ZWaj1x
-AqJPFCCuZS5PXrEvIjgoTRB47KJqw/sb5AXtZXYB3jBrhdWaxKMEmOh/abwm6zvS
-jhVyp/hYs7trROZ9ZF178CndbJMMG29w4NA6hRTe9FEbF/dko2J+zE8CgYEA0xox
-Y4FxucckktsvNvl/SKd0ueN8aJHxy3jtuQTtKuhmrcf9ZFLlyhsZ1osHe0F+dapL
-3FqzgMWdb2mLha+CZ0wgS3wJyGps18AkA8MsOJ7ANMZy8IrTewbo1MZkxU10a5Hs
-kYfUy2YGgRiumqFN+UsEMxB0FEV3V56IMCn1sMcCgYEAmHRvUSYKbUccjBmcyOdm
-3dzgrdZM4FoCSssVAfloIcUG1RNhWFggOzMF4NtTuJglRy51WOTqWZG9/XdqtuHx
-MnksfM7ZJxa9eVASQw4/Q8lW7/tT1wYllscRnvdpLElqD9YAOlmOA/y+vAURW3Se
-q17AocXutx+m0/hrxZdV6V0CgYA+45q7DiEXO2CF745NTl7BAkIf7sltTa0+9LO9
-Xt5Y3gtY0i+G57tVTmWQKLL94TEPVMBs0QiQ4E5alpLeLL8ojuFAG5++eRYb4D3a
-cRaHd6PDFSvAxVrjV9edK81xifWY5kwXvuOCBM8DPpslrdBQ6CxEGi66q0c2byAb
-WSS8mQKBgDtkAAKNTFlSAXxoqqPxESFJTFVHKRZ6QVTwf2s3oNWmCAlxx5oh4W6t
-Yy4dZP7dkCYp6KSwZ0lF8bUGc54hoUZFR+SewLiKgbRq+mgWmnHbMvMoUxGhaHGV
-P4cieXBWZrCa4eq2UPyYv8RvXlEvKht5zvIc2wc2aupOu/0dMG52
------END RSA PRIVATE KEY-----
diff --git a/fixtures/rufus.pem b/fixtures/rufus.pem
deleted file mode 100644
index 3b0eaa9587..0000000000
--- a/fixtures/rufus.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQsFADBZMRMwEQYDVQQDEwpFeGFt
-cGxlIENBMQswCQYDVQQGEwJVUzEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEQMA4G
-A1UEChMHRXhhbXBsZTELMAkGA1UECBMCQ0EwHhcNMTUwNDI4MDEyNTU0WhcNMTYw
-NDI3MDEyNTU0WjBUMQ4wDAYDVQQDEwVydWZ1czELMAkGA1UEBhMCVVMxFjAUBgNV
-BAcTDVNhbiBGcmFuY2lzY28xEDAOBgNVBAoTB0V4YW1wbGUxCzAJBgNVBAgTAkNB
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtjV1orRtFazywT7ueDSV
-B3KsgFaAOUfhtyk2upTmvF8vg+6C47zCzgkPLiELBdMi93jP/86Osnud3zGZxLcb
-+rdP1SWfGzd5QeLHwlM17NTYLhFc6nFzQozKWSZlZGQeCPxpynSSuGHS9qIH+bgq
-mrWQSc7nz2qsqqDxO2yX9XFJ669OOIK3zIroCzi0ElOluerWnaW0430IWk4ykPWU
-yGYtwsdW+vHIqjXMgx0dPkQParpHkDsCSbUYmnsK0PUmuuToIaTX0yR99FJZdnPO
-prwHWTqOe239Xbnmb6QX8qidXjVTJ+FFJwWBMHWd2Z5wIs8+7oTKC8r3tWea66Ih
-aQIDAQABo4H1MIHyMIGBBgNVHSMEejB4gBR233eeV1v6NtTVfho+G5C9LAyys6Fd
-pFswWTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRAwDgYDVQQKEwdFeGFtcGxlMRMwEQYDVQQDEwpFeGFtcGxlIENBggEB
-MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA4G
-A1UdDwEB/wQEAwIFoDAQBgNVHREECTAHggVydWZ1czAdBgNVHQ4EFgQUj0GbM9xU
-MHPV4NhlA3a8EoYKtWIwDQYJKoZIhvcNAQELBQADggIBACs49/6/X1piMMuIYGhT
-2TL1bjs1ew1kSoqzT36cVKv8hTpuy5O/4uYZnIXzyEZ8Fa3jtcs0AHdTxdmbwg/V
-Txzhma8Zl4Asumd36fWMgFRWmM5kBRRhkkT86Zgsi9/DOaZ8QTuxDdhJ7W9VX1gp
-Gbl/vvhKu5QEldT/G+ZmWITBG6vspioPQr/GmEew9bLEQ3X90Ogo+3XFxxBSvlMu
-ueaUKUQOlotwZ/feSnd3N8m9CqsMahGDehPBdq9gPuFNdiwmAq0zvLA+KupPa63x
-bEHjgEJSRwVUvjrST08rSoUtfEL8SzbV95VCffASOuVZM5GN1e8czwxckhKyk6dr
-9knCQS5EsgtluR4jbW2o76t4zEHYxsLQ3KtQ/uAxQ9h5Q6T4z+PA2/TScMOjlm3W
-fWpGaQcWmfyz/T4T2P7GWu0mNzzkVkUls8sz70a7b6xQdf1+l/TRUEO5JUvvYhcF
-f4DB6hnLeaocPeVvReuGX51nSZM2/0eAwCoF8RMfsk6L+dnb8XDv4td0fY6FIVqM
-0zQ/tdVPl2iEH1cRZLFzHJ+AQRxaR665tOS6mR/VFb0mNumvFWHyLYgz/GeGRcEO
-8tQL96ZlYR/Iz98zJBuaJM3hfraYR5PQ6K+F8LJZn4SBdBUy3rZOY80BM2PwZsQw
-yUmpY7ItUcmo5C05DCmUDgnW
------END CERTIFICATE-----
diff --git a/fixtures/secure.example.com.crt b/fixtures/secure.example.com.crt
new file mode 100644
index 0000000000..eac093df79
--- /dev/null
+++ b/fixtures/secure.example.com.crt
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIBAzANBgkqhkiG9w0BAQsFADBfMRowGAYDVQQDDBFOb3Rh
+cnkgVGVzdGluZyBDQTELMAkGA1UEBhMCVVMxFjAUBgNVBAcMDVNhbiBGcmFuY2lz
+Y28xDzANBgNVBAoMBkRvY2tlcjELMAkGA1UECAwCQ0EwHhcNMTUwNzE2MDIwNzI2
+WhcNMTYwNzE1MDIwNzI2WjBgMRswGQYDVQQDDBJzZWN1cmUuZXhhbXBsZS5jb20x
+CzAJBgNVBAYTAlVTMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZE
+b2NrZXIxCzAJBgNVBAgMAkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAxGLqj12q0vhdvao0CwlV9TR/g3ZDdNqSOK2Va3S/fKc8NVVig5Tba8YpkPfx
+7AkRxeKdwXQYHWy0gLL6TBBAhFRbQuEcK41Pu9DM4S44PuN7XGUDf7V5BXSSBafB
+AvOdvRTzp61/0INDTe3A9TJq2m2R1kcYfhWzK5LdL56hs+Dc6wmydMSeDWtGgd+x
+DQM8tDZB4V5KDyC1iS3mRHsfu3yF4xrvvNqgX/AQoTZDKjk0Yr9gJmyqB22Ci2gf
+Ucl7go6M50XBTDPqqURxmH+moyGQUv/nCrFC/pcbir76FwWgZzzsIBi6FT6AY72J
+xRl0WNxp+wwWcAjhxzdEdDa3qwIDAQABo4IBCjCCAQYwgYgGA1UdIwSBgDB+gBQV
+KwXWPSUAZemuBWTExcktTDFwIqFjpGEwXzELMAkGA1UEBhMCVVMxCzAJBgNVBAgM
+AkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZEb2NrZXIxGjAY
+BgNVBAMMEU5vdGFyeSBUZXN0aW5nIENBggEBMAwGA1UdEwEB/wQCMAAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIFoDAdBgNVHREE
+FjAUghJzZWN1cmUuZXhhbXBsZS5jb20wHQYDVR0OBBYEFH+snHidlNOtOZesqH49
+Kkq+p0oxMA0GCSqGSIb3DQEBCwUAA4ICAQAaY/4kwsNmVNwpoQnxFhMXL6Mmd2/t
+tkU8riGakB5jXkK0IAKYWT2gCwJ0XRygrprGUgAaPTmFuCXO1FN+oY7V1Vt/PD2U
+zLBm4jKN86ljlUOFwvL1SQHOMbAJg5CiVsJyh7qv4hdD0aCkpYB2BxzOu66n+w9b
+ent380ELLy0qMNVMpll5/VRLOxSNb2gMexFVK85IozjTwQ8HJiIHf9vMKYc3ekIG
+KBohxnb7YGjwu0ycpP53A7rfPJ3qEiZaCg9nHDQoIBsIRRMDxrTJRuut4nmDNpeT
+kXxpY5uyeDlOSru44HMFX60jK/RQylK+MaU3Awoy8ARuLzjtaUiaNRKiQNGTiXP1
+6BjsvTuLesXFxa8T5gEhbM/pNxAM32TmeabhBqnuXRtcxfId+xRSt5GlOPtvjaJT
+MKKW27OeG09i0KlhJPMfScnfPOjJasDkdUHnRDWQ/7p9bzxDlHMbPEQuaR2luX+h
+AdaxYxqKxGYjXArULHveM71XiWbtRV7e+J0z9yuea3afbGNK/gWfl1hp8RZ8ZuUr
+Lm4BzDIaaE8LTe2/cnDRtSUew4cZa8QvLQ1ht6VRO/SPbDeiVl48pDLFyIlh84TY
+xnzEbLuUeMOBKkwpwW8+w2cQyxYYkL50WHohYEdEcLtCpLZt7hnNfWS/bx6sE4KT
+eMSnfwUqIVbz+w==
+-----END CERTIFICATE-----
diff --git a/fixtures/secure.example.com.key b/fixtures/secure.example.com.key
new file mode 100644
index 0000000000..96c87d9c38
--- /dev/null
+++ b/fixtures/secure.example.com.key
@@ -0,0 +1,28 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAxGLqj12q0vhdvao0CwlV9TR/g3ZDdNqSOK2Va3S/fKc8NVVi
+g5Tba8YpkPfx7AkRxeKdwXQYHWy0gLL6TBBAhFRbQuEcK41Pu9DM4S44PuN7XGUD
+f7V5BXSSBafBAvOdvRTzp61/0INDTe3A9TJq2m2R1kcYfhWzK5LdL56hs+Dc6wmy
+dMSeDWtGgd+xDQM8tDZB4V5KDyC1iS3mRHsfu3yF4xrvvNqgX/AQoTZDKjk0Yr9g
+JmyqB22Ci2gfUcl7go6M50XBTDPqqURxmH+moyGQUv/nCrFC/pcbir76FwWgZzzs
+IBi6FT6AY72JxRl0WNxp+wwWcAjhxzdEdDa3qwIDAQABAoIBAQCb8Et+cYr+IHcW
+7nqKtOwLW5dRBOxFcnUfCj6WZ8rRKV32n4ktIFsm9d/1m9v+Z6k0L2DCxvOLEdE2
+TGfRVCpWqUEaFvOuZXQFl6PHvlKtJSbEU/V2R9wEB+8XDICHXnhHNsbOw0a1hDVC
+QOKyEEmmjdB6jFOXcpWlqOV3NYgC8stljdsBi6yvmVUsolceUg0gzldjdxNIBgvw
+i5IM+CTm+CnFd4dmmeaZz7SncKSmWsz3mwoo6j1AnlmJoEuNKBIGXqD5YTLnGwCY
+H1/XlMAy6KPaPo2/IhIneV8XrNjWFAjmtOBoTChll28ddqiBJpIvn6pyKQenPFVT
+wXmWZtEBAoGBAOX7IQQIc89vBouF5nCkBSawU3vw6vj0EGDx9kyOxXye7O2ZZd6r
+SqYJnS8oePjN54TEC5Ha397VIEMH5b/HtPDrVka2T0cwh1RRbzslI4rEk8Cby+yy
+SsiTSlXF9Q7Z897cYK2PYTUpHn9GxAb1tyOpRVj7wyRCgUXSdiXW0+WBAoGBANqa
+zB8dTVFwSzbz956c9wtNLCym8BGdmR59QUxsby1qJ3KjAeh86WvS72xXHm2h9Knq
+lrvBETfIZ3AqpDAtn0lw608Fgk3kIn8jQnAitVzFwtLp70dZm0CBY+kZee6b08WX
+pFmJlf186ctM7hGSWAq2KcMeho/vtnfw2CzRUqsrAoGAMrxWKkebFPYPYZRmpA7r
+O//GSx95Fvbw7hIzHeyZUMbWygv/V0I+s6aHULIDDhCOtNFzI/g/Ty+BcIg7fTWX
+i1a/r9XkY3YnRMi6Wzf0QVbgqas1L8CdkuY7jfSf/WjDzjSb924cKdgqbDW2ZTqr
+7mgXbmwMPuGVF0w42FwuXwECgYAHYbTE1DN5LYaMq35QD9LTwd5c/6IZpi22dtpO
+n1a9vNjqKRD2bclgB7Zn/SUc5JwjZLWET4eqT40Wn4n9ynyXeUWo3HHC+ZIkoucq
+bDGdmVvzzUx0J1VzvyrFg0O3x/FFudIl59x1u9MVN1rOoxdv/Si52v0GPTz3Hd3e
+3Y6iEwKBgQDkhGo/XCOhj2lgcxfp3xfMySzU7WUeJj0F1xz/O3umhz6aTiFRCVRc
+RVe0DrLpDm1cB/JIYnfqWxL87JdZ0Ujf171+sH7MSftyoKTjvCaw+NTvzWBciMrg
+/Hx+4yz8IG8eLQueJm/YArDttLcidYLXRTeQTMKQFrbOhqr2+DhMJg==
+-----END RSA PRIVATE KEY-----
+