diff --git a/.env.production b/.env.production
index 6dad057..1a226bb 100644
--- a/.env.production
+++ b/.env.production
@@ -1,2 +1,3 @@
 REDIS_URL=redis://redis:6379/0
+INFERNO_HOST=http://localhost
 VALIDATOR_URL=http://validator_service:4567
diff --git a/lib/udap_security_test_kit/certs/InfernoCA.key b/lib/udap_security_test_kit/certs/InfernoCA.key
index 764b8b6..c4d5be2 100644
--- a/lib/udap_security_test_kit/certs/InfernoCA.key
+++ b/lib/udap_security_test_kit/certs/InfernoCA.key
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-u2lflAnEGDoIiMauYMdOCHjrq/l7Jw==
+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
+tEJ5MNpm6vnG8yItV7iRuEmJksvXB0g=
 -----END PRIVATE KEY-----
diff --git a/lib/udap_security_test_kit/certs/InfernoCA.pem b/lib/udap_security_test_kit/certs/InfernoCA.pem
index aafeff1..06b6052 100644
--- a/lib/udap_security_test_kit/certs/InfernoCA.pem
+++ b/lib/udap_security_test_kit/certs/InfernoCA.pem
@@ -1,35 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
-tsGvVZ6GCrAl5XejmwQBzyZQQw==
+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
 -----END CERTIFICATE-----
diff --git a/lib/udap_security_test_kit/certs/TestClient.pem b/lib/udap_security_test_kit/certs/TestClient.pem
index dac4810..4a2a221 100644
--- a/lib/udap_security_test_kit/certs/TestClient.pem
+++ b/lib/udap_security_test_kit/certs/TestClient.pem
@@ -1,32 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIUbdCfB3IJ9bdOPGQVtxJHhMxUWv0wDQYJKoZIhvcNAQEL
-BQAwgYYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNQTEQMA4GA1UEBwwHQmVkZm9y
-ZDEQMA4GA1UECgwHSW5mZXJubzEdMBsGA1UEAwwUSW5mZXJuby1VREFQLVJvb3Qt
-Q0ExJzAlBgkqhkiG9w0BCQEWGGluZmVybm9AZ3JvdXBzLm1pdHJlLm9yZzAeFw0y
-NDA4MTIyMzU4MTBaFw0zNDA4MTAyMzU4MTBaMGExCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJNQTEQMA4GA1UEBwwHQmVkZm9yZDEQMA4GA1UECgwHSW5mZXJubzEhMB8G
-A1UEAwwYVURBUCBFeGFtcGxlIFRlc3QgQ2xpZW50MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAnfqzJCyeFNRhlcsrUPiO2LQtudObDHUKj4Q7fkYPUf9X
-ecTMckfPKd8UJ7x8Vb5o1zmR3hsMoo1A7IkwBkmK2BXvxq243cCGO1q4w/jdL/EG
-DiIZjTr7qvkawyeh9cAaApOrBlD4gnOxB05GjingDZgiT7GqBwrpEB2XJ4tw4idS
-B3W9Rv0ynbgqPKgGw9hnEef+uNAvFIvSbfdz1n4xHNP0GuMuAX+edFCyxYFmDe74
-8pl3TH9dxkoM945r5tHmuJS9n1pXkTB9L5RVbqH77dIyOBobehHHpT4D3zjdSFmh
-fta5NnDi5/iqRcFz7FVO79jJIoAqN+mWBlVH0yyfYQIDAQABo4H7MIH4MC8GA1Ud
-EQQoMCaGJGh0dHBzOi8vaW5mZXJuby5jb20vdWRhcF9zZWN1cml0eS9hYzAxBgNV
-HSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMDBggrBgEFBQcDBDA6
-BgNVHR8EMzAxMC+gLaArhilodHRwczovL2luZmVybm8uY29tL21vY2tfY3JsX2Vu
-ZHBvaW50LmNybDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQU6Eo2
-HE37gpSaW9zBGf0t7XfYnfIwHwYDVR0jBBgwFoAUNOqoPKju4u9y9JAuAfnSAcFb
-NKAwDQYJKoZIhvcNAQELBQADggIBACh2uQ1Krkw6F3Gq0HG3ohCm2j1ynmLSJwGE
-HvPlkiBcs8RBPxZzJOZJBMxGmjTPga2Kt6zsBlmjLg++C7C5/8JruwrMtrBuTtHx
-Kky0Qw+YJm81IgATeDIU/qkJB8LcnHgkQbu3nyoyeKocx9XSW8nlEm4FkyREXxfC
-rSVCoc70GGg2vSnSkRikNjxwKGnHvmEDUOW2bBbbzvTGKlTKSIF50NiNPM3Fi7vF
-bOfi1aZh6m8IKVaI2KUXVFHco1qB3QDK5BUEimko+EyaWSZPvP83PE2+TIdapRrw
-HxQQJEr774GUNH1/hdW0qlP4u3CMMMAjS2H4dOsRYOOmgC6iEewFEBQqTRLkEfgP
-pMxYhGAVAmrglLLr4t+ZF9KOmifvB6f18qF352Bj1D0TMB+oLy67kFw3s2ah21la
-3Xm6hQt+M5mZ/EYZIOUPxMHtqVt5DSJdMENHO2cjcRARyeD/BGYnJqnf6yA1LL2V
-TK+jhC/C/Dcv0hHQnVWlUGlwoFMOOzfsr2K3mXYezAuHASP8LIAyjodPpd6cLQu2
-SZTVVobSebaNmZ2UeX8Bc9bcobM2bbVb2c3UeezEJWOpt5cSOeEScEiwkaktxD5p
-ix1K3KkIg2yDP176ILlVqBBA0X2FqTSSvFbTa5us3XIwkDfARJBpLnA7OfmsO61+
-Ij5io7+X
+MIIFUzCCAzugAwIBAgIUKdvQgt9CpYXlVnXFpHKzGwZ/k3YwDQYJKoZIhvcNAQEL
+BQAwXTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1BMRAwDgYDVQQHDAdCZWRmb3Jk
+MRAwDgYDVQQKDAdJbmZlcm5vMR0wGwYDVQQDDBRJbmZlcm5vLVVEQVAtUm9vdC1D
+QTAeFw0yNTExMjYxNzA0NDZaFw0zNTExMjQxNzA0NDZaMGExCzAJBgNVBAYTAlVT
+MQswCQYDVQQIDAJNQTEQMA4GA1UEBwwHQmVkZm9yZDEQMA4GA1UECgwHSW5mZXJu
+bzEhMB8GA1UEAwwYVURBUCBFeGFtcGxlIFRlc3QgQ2xpZW50MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkc80QhCVpjiX4KFpyN1t0amUxotZ9cgCQudP
+9Hkud6cbG1cAQerzbrK/Kv0ZmJLp48F3t9t/i4FSTeEncTtwsPDhj91wDzKDHvhn
+cNxpDKVlzkmJMwZkE4609La62RLkODTVddawFh9h7yjQvOn9p3chHgu50GJmHP0o
+oJS63jYcN+3ylDZGdhdsyYivYHpvIa0TZRPvJNBDAqZJVtc8JWxMyvJ+xmXW3n7D
+RJZIZElaD6ia1fd4vrZyZWpfSykc0Z/h1sHzaczUFBEWo997n4AOTvmvrn7LcVwv
+OXHc2QV/U9QGkh+0lfMlxUSaDjXA1ZcalbH7nABvBMrvhBkc7wIDAQABo4IBBTCC
+AQEwOAYDVR0RBDEwL4YtaHR0cHM6Ly9pbmZlcm5vLmNvbS91ZGFwX3NlY3VyaXR5
+X3Rlc3Rfa2l0L2FjMDEGA1UdJQQqMCgGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYB
+BQUHAwMGCCsGAQUFBwMEMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHBzOi8vaW5mZXJu
+by5jb20vbW9ja19jcmxfZW5kcG9pbnQuY3JsMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+AgeAMB0GA1UdDgQWBBRB8h7A0m4YPRCtJ/os09LZjzToeDAfBgNVHSMEGDAWgBTq
+6MsgE3U5Vrj+RKNIykV/va3VnzANBgkqhkiG9w0BAQsFAAOCAgEAF91QN/byIdt9
+n5PHvFlzM4wLg+MXKoPavilyl39oUxMjEP0pQwnqms298q9crnwqRKW9BkEaInz3
+VE9y5qM0N4dDWemwqp+EsAA4zlJm6t19107KrMztj22S56PkWPB7R9eEsRruEPwk
+LLdM4XTcSL+LpX8HQq8Nn5xBcnf9VxG9cMWb4dn0bLiZ2bw0+PUiuhKRXL90WOao
+tJ4Hh+6Gh7JX283PHfhjAsWbAq8UguweK4TLd+MlfASs4jvMUGkheSrWB/wQUjHf
+kRPzz6lE0aBEh5YKOXQUP1O0FJoqrAKfjKxYo1K4uNUz6nlsC6cDMiLPB7X1UEr+
++OQ5uPq5FPFaFOdeGR3h/W09BSIIXq1tTdTvvwo3OhybKYGmcQlXvn5/nOQH/dlW
+4Ppw7bGOMLQg1TxWsqT/dy9btR4lv+XnWwNrvSqqSWMyEWS6HWnxOmh7lqqluJhF
+4D0/NelI6YMtr1IFpQlajkumR+roMuxOrGI9J7lSHlV9U5rJKN9kQk2/YvhOhd2/
+TW+Tp6gyZCyGU+rnGvxEulhO0uxOEOdaI/GLrTJ/fhEijw0aRZzOcxxbL7qpzC7K
+b4H9JVVyCS4XsBTEMpjfQB1awxA6LjxstAkkhah7U2+cFKUxguLx6mUaU8Uj3cYi
+9xlqpnyqC6aFw3RQM1TfGWbQVZcfZNI=
 -----END CERTIFICATE-----
diff --git a/lib/udap_security_test_kit/certs/TestClientPrivateKey.key b/lib/udap_security_test_kit/certs/TestClientPrivateKey.key
index 4ce0ec5..2d56ac8 100644
--- a/lib/udap_security_test_kit/certs/TestClientPrivateKey.key
+++ b/lib/udap_security_test_kit/certs/TestClientPrivateKey.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCd+rMkLJ4U1GGV
-yytQ+I7YtC2505sMdQqPhDt+Rg9R/1d5xMxyR88p3xQnvHxVvmjXOZHeGwyijUDs
-iTAGSYrYFe/GrbjdwIY7WrjD+N0v8QYOIhmNOvuq+RrDJ6H1wBoCk6sGUPiCc7EH
-TkaOKeANmCJPsaoHCukQHZcni3DiJ1IHdb1G/TKduCo8qAbD2GcR5/640C8Ui9Jt
-93PWfjEc0/Qa4y4Bf550ULLFgWYN7vjymXdMf13GSgz3jmvm0ea4lL2fWleRMH0v
-lFVuofvt0jI4Ght6EcelPgPfON1IWaF+1rk2cOLn+KpFwXPsVU7v2MkigCo36ZYG
-VUfTLJ9hAgMBAAECggEAApTpPosYHkEGQztpvs4BD5uKL8I8g2yaOpQvoLWmZHGm
-zU+hA7EWuplxq+CRq5kL/5BqSNXqU/G5AOSRC1lCUpuxKm8GWWFfEDNAV7uGadUn
-gy2de0heeoHNpSjNpcV451fgcJ78IK2hU/w8fPBEQBSfYuwFWk4cVu4U3UmTE68I
-O7PpCdTjk70IOsLT8uBagAOw92Fj0mGU7agCdWfJ+LjPRUtg+PhVvODatL3taG+l
-FAParsomiRqKGINyn8vALXNISuBYHVDUzv93P10gG5rA2sJ7953/+++Hr9DoLpmL
-SH/q/LebFzPJ2u6KzLc6bam1YX0w/MSNTJVIxA5V/QKBgQDU+iFXdShLwvEXGVtb
-FdZuRk3XsN+yfkFyM9SZrmaLF2VBALkC5pd+rYkXSaTA/cbs623VOYpoJhVmjL8d
-VvTlN/G+8TzfdsmOlAXiOSiUn3VKM/Othu5l9k0AgylU8aXBWTUv5FzmV8gMn+/s
-9oOucAVFa60LdkR2d609y/tKnwKBgQC95Gviall3E/+7drT05KxPPGDKRUjhCLBe
-BNj2+ttSt4+v+E5v3K+LSd11VfGkvLkDvkhjiJlVamf+XgLne3TLrEThAKq8ySUr
-XKBRi+nfmisUHSrMGljHw500Rx+MR/LEpfEERMosLQWTrOTz5VG2RueVHbWbD622
-Witr8tnV/wKBgGDYUNr9GlLBFXJEhIc5ueUxMOp4sm/u+4Gb0fwEEvsCq3dQhdCs
-3IytCp69TR65B4DqWWpRHP/Y+XhFXg5QYVHuC46hEeYnlOWxp69EAJD8pZAVaaQp
-rDRPOJqYCe5nZ9Ew6H+bnybbGcur2qTtP9nNdIgpu2lv4RfhubRVEjLPAoGAXqzb
-SSii8GbNMwcNU6gLbPn6e/6tRl1RqZ6bGhCadxREFIUlfko2T6kFPDIcZ3kceYxO
-hSme4WJK9RykMAtygPWj5daySauz13m4CNBMS4qO/dlI9DgSmY6i+2SWixd4J6lg
-kDNH5VyREj66bAuigNG7NrJ4UBYyEt/EFG8hQrsCgYEAyLwk7f2Wgu9ykdwSrrQE
-TBK0iOVUcwPhxj1UbFyDxPdO0EspyKtIFD5w/sbBtQbJGSUFd7ZPoCsYkT2yAsDp
-3cI/ubRxA+/GaqUo84QxvJ4Uqdu8YS8C0FCEnhXGjA60Y5HFzufJF5EqfzwNctCr
-G0cRyX/4Ut4BNUcir/CRVL0=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCRzzRCEJWmOJfg
+oWnI3W3RqZTGi1n1yAJC50/0eS53pxsbVwBB6vNusr8q/RmYkunjwXe323+LgVJN
+4SdxO3Cw8OGP3XAPMoMe+Gdw3GkMpWXOSYkzBmQTjrT0trrZEuQ4NNV11rAWH2Hv
+KNC86f2ndyEeC7nQYmYc/SiglLreNhw37fKUNkZ2F2zJiK9gem8hrRNlE+8k0EMC
+pklW1zwlbEzK8n7GZdbefsNElkhkSVoPqJrV93i+tnJlal9LKRzRn+HWwfNpzNQU
+ERaj33ufgA5O+a+ufstxXC85cdzZBX9T1AaSH7SV8yXFRJoONcDVlxqVsfucAG8E
+yu+EGRzvAgMBAAECggEAKai2SRPc9d9ggVUM2M9vE4Ksl6dz3fW1s7DMFtDStmv/
+oimS0MKUp7GZTep/eCite52om1ay08RwpACq2L6/XUaNY6HEZQstDFmzkDrhJrRQ
+6IX5FaODT1UsHWjh7KhpnSd3P5JFwCRaQk76iKcgCktOont+LOwYObsY8vxbgaYs
+tUHTfYgcnjFKxGVweSkeHtwJH8b8ImEFUq0PK/q9yl45UAclZoe1P8GT4BFgWuAU
+6aODeD9VEHOGX/R17VHogtn6d3g/jMdchG9FBvc8jtihQFQOmvIxaOtFN5wM0loD
+XiWIlIcCKLpw3m+3a2nfa7BYbXqXEX6hDAz6YuelUQKBgQDCvFu9sDnLryeRcvDe
+VIcyNleqNyp3sh8zZSKFQaxZYi9Q29Kb/PfGycVevdvDmoAc/IjTcXtCpS5gHRVa
+ZVGptBg7GtOebK93RWTWynrghGcyY8l1yZn4dCk/hfmaiP2CWPlCC6v4rbDHfF1O
+rQTOpBF8zbd8J+6pP71lXFKwMQKBgQC/rmji++dlO5nJJSqLpYhR1K8XkvyvBrjp
+qonw3xNjC3sBHL+TMXxI3ieyLIuMwym0KTgPCWRQvFCrFk1Lza3AqnJTWYf70e7h
+ecQpgYwYz64guSbZHgnWB49Q0HwaDpYAmcyEt604z41+hJ1Nz70H6RPdQyfOVRmN
+IZ5KxF93HwKBgQCSWMQJVjrZHBT8dgkWzSedUMGpJjRAKBjSoxrCUoyXz/YHKmyo
+1f/P4Sr2/HAAHEhTgGXDofEkMMcdbD3z5Vjt1G6xXIPU95EWbYxO73RQ7rAvalao
+so2H7qRhHOpsfK8oGn2YaPUguke0Y34r9lM6iIqr5F4UbF4ry78mQa/SwQKBgA9h
+pIMKadAizz1n4RkhqGXApmhC4En/RRljGPyeOgUJp844C1t5bhq+0PqoPm6GPrN5
+V0lFnKop4mNIP92kXJwIUXJEzfe0KfIn/kjCX4aiK7vuf6KOmYV2R9bZVAwXPYxA
+yzufLaRQa29KnwDeebHHz1NDD0+sXoeHuhcP2QVLAoGBALlED8brM8SQtB6l0058
+keZCv3F/QROCUuddr4EpvgMm8Sk9KZ2QiG+EDrjBcnKbkRU/mKpwARFE8ZvYSzhj
+klz+i8VYgiAXtHOZAO7V5pAo4CS/EikcrRN8+TtAivQ/PloLOjPoCqHyd3JpEMpL
+KHnS1NBDZYBtIMCq7Xt3NNJn
 -----END PRIVATE KEY-----
diff --git a/spec/fixtures/crl/InfernoCA_CRL.pem b/spec/fixtures/crl/InfernoCA_CRL.pem
index 16d4b55..0c3ec73 100644
--- a/spec/fixtures/crl/InfernoCA_CRL.pem
+++ b/spec/fixtures/crl/InfernoCA_CRL.pem
@@ -1,18 +1,17 @@
 -----BEGIN X509 CRL-----
-MIIC4DCByQIBATANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAk1BMRAwDgYDVQQHDAdCZWRmb3JkMRAwDgYDVQQKDAdJbmZlcm5vMR0wGwYD
-VQQDDBRJbmZlcm5vLVVEQVAtUm9vdC1DQTEnMCUGCSqGSIb3DQEJARYYaW5mZXJu
-b0Bncm91cHMubWl0cmUub3JnFw0yNDA4MTIyMzU4MDlaFw0yNTA4MTIyMzU4MDla
-oA4wDDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAgEAOBZ5zK7R7DFAudgg
-Fojx0xukZXkxAgquz2dARLb6g8ZtMajz7ARrq/q7BUyUVPIzDFbaXw76YXQOsYU+
-M/hxLarvDPnNoeTTTqEIBZITqWFCD96jThkucmo5DEIniSOah9Xq9/vDZHf1tLOI
-990b1JMCFwtU2MTJbgVYS4hK9mIxewrwkgO4txWXHp3YbXz5Qb4ru7wXWAyOUE/t
-+83wqKrF91gaWoHYJW7WM6ljk6AEif7vAzpXI0v9dv4DI1NipPX6dbDwavXpxVZk
-SGXWFGHtX6uEvEUyo3GFc/DdfDN0ISgifBffJbaMc5M9n82AbA3a9oupIiCaytzE
-mfGPojimyxAfTNI4Zodlz6HVz6CQGjFD4BsMYgrbUZtBy71wW4sIYNd179WeFD1h
-H/B0auR5Pfqr5wQhRIuJMZoGxxwPaHmyBti9zbX2isHCgk/7kuugc8fsCRB5d6eg
-aau8/vRVIqzNlrGA8u8maTCpg68gFuIpYXNYhc6TC/lz3Lw0hqVlSREZ50i0vLFM
-+0oFJHGHKKRYQWWdtsu4nggSrVLQt9uloWabruQ7pE/cR4KtgOcQu19qd41Qo9dT
-+JsQzUkqzh+qGq+UTZTya4vfhrKl80X3MV/zTNuT9A6/QSpwts2iL4X44Q7fCOJe
-6Yd5TWReTf2sKEakYCRx9sKNUbQ=
+MIICtjCBnwIBATANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCTUExEDAOBgNVBAcMB0JlZGZvcmQxEDAOBgNVBAoMB0luZmVybm8xHTAbBgNV
+BAMMFEluZmVybm8tVURBUC1Sb290LUNBFw0yNTExMjYxNzA0NDZaFw0yNjExMjYx
+NzA0NDZaoA4wDDAKBgNVHRQEAwIBAjANBgkqhkiG9w0BAQsFAAOCAgEAjh9c7LfE
+08uzLGbKBJj5K76KYPadBnOoXvqDhYjtXomy2D2fk8sA41WeFAc/2BvdsAgWEbuy
++7Js6kCEqawBPjMfFCFORd5zkb/4dBHJosEPorBROV57obVHDeupFXVLem7/ixcz
+nbt3f8/cZyMWuI2c4Gasv3gjJJYlYtAFh0OV7OE4Bfr6eB02aTr8OJtvwCWpoPNA
+cZ+78D36eA5ClNWoHL+e1mwxwy3C78phLyPaouXmJetfd5SlJxpBjAbS4EWK4iOJ
+9zlrF2RhWMLh2/R1ejkqyKwxH/aLAp5l2xYtJLOBFA7WpNqs4V6cSgA7QAegWkbY
+IHI9psXOHx6tkCoAFWhoZdrNKJEXkihiT0XM0shDy/tGhn5FuiwswXf9NSdStLV4
+SsJUzS9fLOcbUUkquQJH+sxwtBoKAaSVA7BJCI220G1yIeA7H7gNoei0/nYiUcp2
+q3vDBb/aeWIqPJqRT8kYmYOaBhMQeWesHiVPSwFpC4BcwYtsigTLAOlgyyuYx/zY
+jHCQf1PCQ95i+cRwiua8Z2V40e07sLXQCggIMty82bUuSCf3dWyOtHOu6TKqZqoc
+KjRJH0j4NhIy/SFlA5got70e0S9GAWMx0ICRXaRWMQfXuJUVRnAD7mw0bj52YfWY
+eDiNji0tEgj7BnX/5jNRXTSV0jRdRE4LusQ=
 -----END X509 CRL-----
diff --git a/spec/fixtures/crl/crl_number b/spec/fixtures/crl/crl_number
index 8a0f05e..75016ea 100644
--- a/spec/fixtures/crl/crl_number
+++ b/spec/fixtures/crl/crl_number
@@ -1 +1 @@
-01
+03
diff --git a/spec/fixtures/crl/crl_number.old b/spec/fixtures/crl/crl_number.old
index 4daddb7..9e22bcb 100644
--- a/spec/fixtures/crl/crl_number.old
+++ b/spec/fixtures/crl/crl_number.old
@@ -1 +1 @@
-00
+02
diff --git a/spec/fixtures/generate_certs.sh b/spec/fixtures/generate_certs.sh
index 8205780..569758b 100755
--- a/spec/fixtures/generate_certs.sh
+++ b/spec/fixtures/generate_certs.sh
@@ -7,7 +7,7 @@ echo "CA private key generated"
 
 echo "Now generating self-signed CA cert"
 
-openssl req -x509 -new -nodes -key InfernoCA.key -sha256 -days 3650 -subj "/C=US/ST=MA/L=Bedford/O=Inferno/CN=Inferno-UDAP-Root-CA/emailAddress=inferno@groups.mitre.org" -addext "keyUsage = digitalSignature, keyCertSign, cRLSign" -addext "certificatePolicies = anyPolicy" -out InfernoCA.pem
+openssl req -x509 -new -nodes -key InfernoCA.key -sha256 -days 3650 -subj "/C=US/ST=MA/L=Bedford/O=Inferno/CN=Inferno-UDAP-Root-CA/" -addext "keyUsage = digitalSignature, keyCertSign, cRLSign" -addext "certificatePolicies = anyPolicy" -out InfernoCA.pem
 
 echo "Self-signed CA cert generated"
 
diff --git a/spec/udap_security_test_kit/signed_metadata_contents_test_spec.rb b/spec/udap_security_test_kit/signed_metadata_contents_test_spec.rb
index 3631a3f..7361736 100644
--- a/spec/udap_security_test_kit/signed_metadata_contents_test_spec.rb
+++ b/spec/udap_security_test_kit/signed_metadata_contents_test_spec.rb
@@ -47,7 +47,7 @@
     }
   end
 
-  let(:udap_fhir_base_url) { 'https://inferno.com/udap_security/ac' }
+  let(:udap_fhir_base_url) { 'https://inferno.com/udap_security_test_kit/ac' }
 
   let(:client_cert_pem) do
     UDAPSecurityTestKit::DefaultCertFileLoader.load_test_client_cert_pem_file