diff --git a/SI/2DCode/raw/REC.json b/SI/2DCode/raw/REC.json
index 12ffc050..a0bdaea7 100644
--- a/SI/2DCode/raw/REC.json
+++ b/SI/2DCode/raw/REC.json
@@ -16,22 +16,22 @@
 				"is": "Nacionalni inštitut za javno zdravje",
 				"df": "2021-05-12",
 				"du": "2021-10-28",
-				"ci": "URN:UVCI:01:SI:C585251452FF6F0DE053#G"
+				"ci": "URN:UVCI:01:SI:C5A831C188A043AEE053#8"
 			}
 		]
 	},
-	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313937382d30342d3138617281bf627467693834303533393030366266726a323032312d30352d303162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a656264666a323032312d30352d31326264756a323032312d31302d3238626369782555524e3a555643493a30313a53493a43353835323531343532464636463044453035332347ffff",
-	"COSE": "d2844da20126044882db104d1f3657aca058f4a401625349041a614b4363061a60d49c63390103a101a4617281a7626369782555524e3a555643493a30313a53493a4335383532353134353246463646304445303533234762636f6253496264666a323032312d30352d31326264756a323032312d31302d32386266726a323032312d30352d303162697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a656274676938343035333930303663646f626a313937382d30342d3138636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e305840c223760d5fd4890b3e1a19361a2ef377540d255419b91718dcd3770397ba171f3f4a24e98ffbacfb0addfc139db9de7bfcb6a93c0e104967afd61cef829b2032",
-	"COMPRESSED": "78dabbd4e2bb88518dc5a3e9b680afbc59f89a05115f963026057bb248257a3b27b349255c99936cc9c8bc9071496251e3f2a4e4cc0ad5d0203fabd030674f2b0343ab604f2b67530b532353431353233737333703175703536365f7a4e47ca0294929695946064686ba06a6ba86464929a5109ea181ae9145525a115ccec03029b3b842d52f3139333f2f31272f532133efe8c292cc92d21285aa4485acc4b2bc7c85aa94a2c4b2acd4a492f44c0b13a02596060666c929f949598696e616ba0626ba8616c97989b94b92d2f232dc437d3cbdfda31c93d2f352bc8074725a5e095c30393daf04225a965a946aa867ac6710e17048b98c37fe4a27b79d94a49994dee7f2105ed510c99de212772e97334fdf252e6fefa5f2b2fff79adf5c77ff08cfdd79affacfb695367c029ee9ebafc9bc6f9aad6004001fff70a4",
-	"BASE45": "NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ$82I:ID 4VSFJ59GKF%055B9ZVBUSI-MPW$NLEEEJCY S2%KYZPG1RK34JWLG56H0API0.TLH0A 2DJJ1/K4QL8/MA5:6GL6QH000BHOA3+C2%K:XF*95QA5*CBVZ0K1H$$05QN%*8-B5O42ZIK43MGY8HHB/WBFDOAC5ADNZ.Q1A6OL6L/5-.4-MAKP66JT5PIBPIGF2SNLK+G:%OC$NI+GPZI:%O9%LA KZ*U0I12BKL/II 0HJP7NVDEBK3JD*2:Y05QNS*2IGF5JNBPI$RU2%RK$F$0O-RK.UIAYUG$NKWE4JBB81F46-Z7NN0FKBDKBYLDZ4DE1DMMSW89UWHS6W.05K-JH K+ INET5324.Q/LP4QS03F75JH4ANV4Z6E2:KDSMQDVUAST7F551.:R5BMTBQ%%ILUF14KZZTTMP+4EE-LYM0124 AE",
-	"PREFIX": "HC1:NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ$82I:ID 4VSFJ59GKF%055B9ZVBUSI-MPW$NLEEEJCY S2%KYZPG1RK34JWLG56H0API0.TLH0A 2DJJ1/K4QL8/MA5:6GL6QH000BHOA3+C2%K:XF*95QA5*CBVZ0K1H$$05QN%*8-B5O42ZIK43MGY8HHB/WBFDOAC5ADNZ.Q1A6OL6L/5-.4-MAKP66JT5PIBPIGF2SNLK+G:%OC$NI+GPZI:%O9%LA KZ*U0I12BKL/II 0HJP7NVDEBK3JD*2:Y05QNS*2IGF5JNBPI$RU2%RK$F$0O-RK.UIAYUG$NKWE4JBB81F46-Z7NN0FKBDKBYLDZ4DE1DMMSW89UWHS6W.05K-JH K+ INET5324.Q/LP4QS03F75JH4ANV4Z6E2:KDSMQDVUAST7F551.:R5BMTBQ%%ILUF14KZZTTMP+4EE-LYM0124 AE",
-	"2DCODE": "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",
+	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313937382d30342d3138617281bf627467693834303533393030366266726a323032312d30352d303162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a656264666a323032312d30352d31326264756a323032312d31302d3238626369782555524e3a555643493a30313a53493a43354138333143313838413034334145453035332338ffff",
+	"COSE": "d2844da20126044882db104d1f3657aca058f4a401625349041a614d943b061a60d6ed3b390103a101a4617281a7626369782555524e3a555643493a30313a53493a4335413833314331383841303433414545303533233862636f6253496264666a323032312d30352d31326264756a323032312d31302d32386266726a323032312d30352d303162697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a656274676938343035333930303663646f626a313937382d30342d3138636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e305840eae030f8cc693d28837ae4836ee944e34752ab48e06e38a8d9e8d25f382b897cc1e4b65e5236dad1824626a5e62cc04f93529d8aa432450727df5fb1684e335f",
+	"COMPRESSED": "78dabbd4e2bb88518dc5a3e9b680afbc59f89a05115f963026057bb24825fa4eb166934ab8f6d6da92917921e392c4a2c6e549c99915aaa1417e56a161ce9e56068656c19e56cea68e16c686ce8616168e0626c68eaeae06a6c6ca1649c9f940539252d2b28c0c8c0c750d4c750d8d92524a213c43035d238ba4b422b89c816152667185aa5f6272667e5e624e5ea64266ded185259925a5250a55890a59896579f90a552945896559a94925e9991626404b2c0d0ccc9253f293b20c2dcd2d740d4c740d2d92f312739724a5e565b887fa787afb473926a5e7a57801e9e4b4bc12b860727a5e0944b42cb528d550cf58cf20c2e1d503831f67326d359aab9e34e7bd7479ec1eb4dae3419ec58a9b2f2ec55b6877d61c7cb22d2ec8ecd6c52637b5a5cf740ef84f0e9adbb5c4c8955dfd7efcc60c3fe37800aeff75b9",
+	"BASE45": "NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ$82I:ID 4VSFJ59/SV9JM-RIAHNC7R NI4EFSYSS%OM6PYE9*FJVPLQC8$.AIGCY0K5$0O/AY0KR5QE/HH4P+4QTZ2/.HQ+4V1I00MY3LTOPYE9/MVJPA7LAXPMHQ1*P1TU1+ZEH+H6IA394AL8%YBITHYYMAFN1GGYIA FEAOL2KC3/C.-B$+9$0L90D.LQ+X47Y4WU4R A*D1SGH+IFZD1Z95SGH3FB5B9-NT0 2Y58RP5 R1JMI:TU+MMPZ5QX5TU19UEBY5 WUQRELS400TYEN+TVSOF809%*4 CTV7FQPT8%MMG2U8C6LFW71:YMQ+MN/QP9QE8QTSO -Q.PG32DC D+OJ00KFDTRWEB%T%%M$WSA3KNNHI/5X.OD9D23RHYF1W51IP 6RI$4G/M8AQ7+1X:9/PJ2:M4GPV*BI2GU1PK38U7FO5MW*E",
+	"PREFIX": "HC1:NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ$82I:ID 4VSFJ59/SV9JM-RIAHNC7R NI4EFSYSS%OM6PYE9*FJVPLQC8$.AIGCY0K5$0O/AY0KR5QE/HH4P+4QTZ2/.HQ+4V1I00MY3LTOPYE9/MVJPA7LAXPMHQ1*P1TU1+ZEH+H6IA394AL8%YBITHYYMAFN1GGYIA FEAOL2KC3/C.-B$+9$0L90D.LQ+X47Y4WU4R A*D1SGH+IFZD1Z95SGH3FB5B9-NT0 2Y58RP5 R1JMI:TU+MMPZ5QX5TU19UEBY5 WUQRELS400TYEN+TVSOF809%*4 CTV7FQPT8%MMG2U8C6LFW71:YMQ+MN/QP9QE8QTSO -Q.PG32DC D+OJ00KFDTRWEB%T%%M$WSA3KNNHI/5X.OD9D23RHYF1W51IP 6RI$4G/M8AQ7+1X:9/PJ2:M4GPV*BI2GU1PK38U7FO5MW*E",
+	"2DCODE": "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",
 	"TESTCTX": {
-		"validationClockInstant": "2021-06-25T14:53:23.149560Z",
+		"validationClockInstant": "2021-06-27T09:02:51.073126Z",
 		"VERSION": 1,
 		"SCHEMA": "1.3.0",
 		"CERTIFICATE": "MIIC6DCCAo6gAwIBAgIUfl5c6SqMnjlKdOrSZdocRXqRQ/kwCgYIKoZIzj0EAwIwgaYxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczE8MDoGA1UEAwwzU2xvdmVuaWFuIEFjY2VwdGFuY2UgRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBDU0NBMB4XDTIxMDUyNTE0MzMzMVoXDTIzMDUyNTE0MzMzMVowgYgxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEeMBwGA1UEAwwVREdDIEFjY2VwdGFuY2UgU2lnbmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEp7NEJHAyIVwZPfB5bvz4756ICGwhOn5iRhWJHuREQSvtGpQfVK20PgMTTgUCmYQBkSw5mlKgpRNcn2RVnGEAHqOBtTCBsjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFHdI8JFtk93CuAGHO8hAf4EDLkw5MB8GA1UdIwQYMBaAFO+TWyMgX3mwQCOTolTEpG4BKPGeMDMGA1UdJQQsMCoGDCsGAQQBAI43j2UBAQYMKwYBBAEAjjePZQECBgwrBgEEAQCON49lAQMwKwYDVR0QBCQwIoAPMjAyMTA1MjUxMDAwMDBagQ8yMDIyMDUyNTEwMDAwMFowCgYIKoZIzj0EAwIDSAAwRQIgPKt0CxtdxWA2iH6tcQzAvoHDRAnd5LvzSQp6+mx6n6ACIQDpUeZBNEENn08kU9DIjaKeyAw79MQpqAu/KbQnqIj79w==",
-		"VALIDATIONCLOCK": "2021-06-25T14:53:23.149560Z"
+		"VALIDATIONCLOCK": "2021-06-27T09:02:51.073126Z"
 	},
     "EXPECTEDRESULTS": {
         "EXPECTEDVALIDOBJECT": true,
diff --git a/SI/2DCode/raw/VAC.json b/SI/2DCode/raw/VAC.json
index 16067f00..6f85701d 100644
--- a/SI/2DCode/raw/VAC.json
+++ b/SI/2DCode/raw/VAC.json
@@ -11,30 +11,30 @@
 		"v": [
 			{
 				"tg": "840539006",
-				"vp": "J07BX03",
+				"vp": "1119305005",
 				"mp": "EU/1/20/1525",
-				"ma": "ORG100001417",
+				"ma": "ORG-100001417",
 				"dn": 1,
 				"sd": 1,
 				"dt": "2021-05-15",
 				"co": "SI",
 				"is": "Nacionalni inštitut za javno zdravje",
-				"ci": "URN:UVCI:01:SI:C585251452FE6F0DE053#I"
+				"ci": "URN:UVCI:01:SI:C5A831C1889D43AEE053#I"
 			}
 		]
 	},
-	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313934382d30392d3035617681bf62746769383430353339303036627670674a303742583033626d706c45552f312f32302f31353235626d616c4f524731303030303134313762646e01627364016264746a323032312d30352d313562636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626369782555524e3a555643493a30313a53493a43353835323531343532464536463044453035332349ffff",
-	"COSE": "d2844da20126044882db104d1f3657aca059010ba401625349041a614b4339061a60d49c39390103a101a4617681aa626369782555524e3a555643493a30313a53493a4335383532353134353246453646304445303533234962636f62534962646e016264746a323032312d30352d313562697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626d616c4f5247313030303031343137626d706c45552f312f32302f313532356273640162746769383430353339303036627670674a30374258303363646f626a313934382d30392d3035636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e305840fe2410438f437541690b744fcca7b6b77ce7bcc291cc32e027b8f265ecd722307f089b4db02c4f7574d01311a63c88393105af23f97f4203b673daa85d0e38e8",
-	"COMPRESSED": "78dabbd4e2bb88518dc5a3e9b680afbc59f89a05918cdc4b1893823d59a412bd9d2dd9a412aeccb1b464645ec8b824b1ac7155527266856a68909f556898b3a79581a155b0a795b3a985a991a9a189a9919bab999b818bab81a9b1b26752723ed094a4943cc6a494922c230323435d03535d43d3a4cce20a55bfc4e4ccfcbcc49cbc4c85ccbca30b4b324b4a4b14aa1215b212cbf2f215aa528a12cbb25293721373fc83dc0d0d80c0d0c4d03c29b720c73554df50dfc840df10686352710a6352497aa68509d0424b0303b3a4b282742f0373a70803e3e494fca42c434b130b5d034ba0bdc97989b94b92d2f232dc437d3cbdfda31c93d2f352bc8074725a5e095c30393daf04225a965a946aa867ac6710e1f04f45c0b9dfb9d43193bbc4ffccf26ddb6b9eef3934f18cd103f51d9f52df5c5732a8e798edbb41c7bfb4e482b0e0329b0e4b43d6f5ca3feb9d98b715df5a11cb67f10200a37d7889",
-	"BASE45": "NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0IIA%R 43-KG/EBRG27*J6NRCG2L*PA M:UC*GPXS40 LHZA KE:%G%9DJ6K1AD1WMN+I HK/EMS-IHJLTJL0KL6IHFII9VLTTJPTHSHG+KMZ2D-JEQGQC KXU7C KPLI8J4RK46YBBOA%P8N$K-PS $A4+O6-P*%NT JEU9W*PORKZM9EN95M9NMLJX2-G24WUBX2PJA-G2KOM SITK2N-V% R V1+GOT*OBR7Z6NC8P$WA3AA9EP:8S%8D0JA4E15IAXMF$ GYEQXL92L0. K6MGK.5.REQ01K SP$I/XK$M8FI26YBAP9U:NIGF5JNBPI$RU2%RK$F$0O-RK.UIAYUG$NKWE4JBB81F46-Z7NN0FKBDKBYLDZ4DE1DFPS/0AHGOXCS6$QJUIV+O-+P/*DARD-AU8V64 HNM0NX3KLAEUB8I6NCTJ2U9E8QAO/*SAGM+H6E 1-P8C3VS38O-JO6NSASAB2E6DHB03UKWAF",
-	"PREFIX": "HC1:NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0IIA%R 43-KG/EBRG27*J6NRCG2L*PA M:UC*GPXS40 LHZA KE:%G%9DJ6K1AD1WMN+I HK/EMS-IHJLTJL0KL6IHFII9VLTTJPTHSHG+KMZ2D-JEQGQC KXU7C KPLI8J4RK46YBBOA%P8N$K-PS $A4+O6-P*%NT JEU9W*PORKZM9EN95M9NMLJX2-G24WUBX2PJA-G2KOM SITK2N-V% R V1+GOT*OBR7Z6NC8P$WA3AA9EP:8S%8D0JA4E15IAXMF$ GYEQXL92L0. K6MGK.5.REQ01K SP$I/XK$M8FI26YBAP9U:NIGF5JNBPI$RU2%RK$F$0O-RK.UIAYUG$NKWE4JBB81F46-Z7NN0FKBDKBYLDZ4DE1DFPS/0AHGOXCS6$QJUIV+O-+P/*DARD-AU8V64 HNM0NX3KLAEUB8I6NCTJ2U9E8QAO/*SAGM+H6E 1-P8C3VS38O-JO6NSASAB2E6DHB03UKWAF",
-	"2DCODE": "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",
+	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313934382d30392d3035617681bf627467693834303533393030366276706a31313139333035303035626d706c45552f312f32302f31353235626d616d4f52472d31303030303134313762646e01627364016264746a323032312d30352d313562636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626369782555524e3a555643493a30313a53493a43354138333143313838394434334145453035332349ffff",
+	"COSE": "d2844da20126044882db104d1f3657aca059010fa401625349041a614d939e061a60d6ec9e390103a101a4617681aa626369782555524e3a555643493a30313a53493a4335413833314331383839443433414545303533234962636f62534962646e016264746a323032312d30352d313562697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626d616d4f52472d313030303031343137626d706c45552f312f32302f3135323562736401627467693834303533393030366276706a3131313933303530303563646f626a313934382d30392d3035636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e3058409c76a81fcc7629b29da5234f7adc2cc4c16f12a1f4664a3f2cd864d51fba3d11fbaff3ec87fa4150758d4df2cd41b90e69ff049c3f4ef76b6b60bf057a8a4b90",
+	"COMPRESSED": "78dabbd4e2bb88518dc5a3e9b680afbc59f89a05918cfc4b1893823d59a4127d27cf63934ab8f6669e2523f342c62589658dab9292332b544383fcac42c39c3dad0c0cad823dad9c4d1d2d8c0d9d0d2d2c2c5d4c8c1d5d5d0d4c8d953d9392f381a624a5e43126a5946419191819ea1a98ea1a9a26651657a8fa252667e6e725e6e4652a64e61d5d589259525aa25095a89095589697af509552945896959a949b98eb1fe4ae6b680004862686e649b90539aea1fa86fa4606fa86a646a649c5298c4925e9991626401b2d0d0ccc92ca0ab20c0d0d2d8d0d4c0d0c4c9353f293b20c2d4d2c740d2c817627e725e62e494acbcb700ff5f1f4f68f724c4acf4bf102d2c969792570c1e4f4bc128868596a51aaa19eb19e4184c39cb215f267ca3437cd5daaec5f7547e7c8c17ca1855fd2bcec756ea45c95df652bf87bfde737edbf1c034a7b7d3f9d75dcc997f99f658ebddff7ecec84fdac555dde130010f57cf3",
+	"BASE45": "NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0IIC+V 43-KG/EB8F2L15LQC3K9X6VU:JNO4*J8OX4W$C2VLWLIML53O8J.V J8$XJK*L5R1-KGT.LVX95Y5KW1/T1DQ5YZB4WH6 BTU1K+HDZ7:PIPHGLS47%S%*48YIZ73423ZQT-EJFG3J%44$2DGLFV436D/9TN8TNZC0YC2W3*8B6DBRKBJ8A.DLR*IV1JF7ML*I-XIT1JHOJ7UJQWT.+S1QD4007/GJ2HIE9WT0K3M9UVZSVV*001H--8UE9GB55B9-NT0 2V48DV5 R13PI%F1PN1/T1J$HTR9/O15SI:TU+MMWW5+R5.T1MGG025RZ4E%5MK9FWPZ02KQUT7VAKEQK91R92G0 KP8EFKBEM.S-YN0BHUDBQEAJJKKKMWC8 WO4NM0TUEPPK27%$BV*T8$EQDTWKO*IK55CY*N2%E1ZKR.IOZCQIVJ4W73797OWI0NRF+18M+E$LP3PVX$C70OIFVN+T53WSZAG3SG00O1VI5",
+	"PREFIX": "HC1:NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0IIC+V 43-KG/EB8F2L15LQC3K9X6VU:JNO4*J8OX4W$C2VLWLIML53O8J.V J8$XJK*L5R1-KGT.LVX95Y5KW1/T1DQ5YZB4WH6 BTU1K+HDZ7:PIPHGLS47%S%*48YIZ73423ZQT-EJFG3J%44$2DGLFV436D/9TN8TNZC0YC2W3*8B6DBRKBJ8A.DLR*IV1JF7ML*I-XIT1JHOJ7UJQWT.+S1QD4007/GJ2HIE9WT0K3M9UVZSVV*001H--8UE9GB55B9-NT0 2V48DV5 R13PI%F1PN1/T1J$HTR9/O15SI:TU+MMWW5+R5.T1MGG025RZ4E%5MK9FWPZ02KQUT7VAKEQK91R92G0 KP8EFKBEM.S-YN0BHUDBQEAJJKKKMWC8 WO4NM0TUEPPK27%$BV*T8$EQDTWKO*IK55CY*N2%E1ZKR.IOZCQIVJ4W73797OWI0NRF+18M+E$LP3PVX$C70OIFVN+T53WSZAG3SG00O1VI5",
+	"2DCODE": "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",
 	"TESTCTX": {
-		"validationClockInstant": "2021-06-25T14:52:41.345203Z",
+		"validationClockInstant": "2021-06-27T09:00:14.984040Z",
 		"VERSION": 1,
 		"SCHEMA": "1.3.0",
 		"CERTIFICATE": "MIIC6DCCAo6gAwIBAgIUfl5c6SqMnjlKdOrSZdocRXqRQ/kwCgYIKoZIzj0EAwIwgaYxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczE8MDoGA1UEAwwzU2xvdmVuaWFuIEFjY2VwdGFuY2UgRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBDU0NBMB4XDTIxMDUyNTE0MzMzMVoXDTIzMDUyNTE0MzMzMVowgYgxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEeMBwGA1UEAwwVREdDIEFjY2VwdGFuY2UgU2lnbmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEp7NEJHAyIVwZPfB5bvz4756ICGwhOn5iRhWJHuREQSvtGpQfVK20PgMTTgUCmYQBkSw5mlKgpRNcn2RVnGEAHqOBtTCBsjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFHdI8JFtk93CuAGHO8hAf4EDLkw5MB8GA1UdIwQYMBaAFO+TWyMgX3mwQCOTolTEpG4BKPGeMDMGA1UdJQQsMCoGDCsGAQQBAI43j2UBAQYMKwYBBAEAjjePZQECBgwrBgEEAQCON49lAQMwKwYDVR0QBCQwIoAPMjAyMTA1MjUxMDAwMDBagQ8yMDIyMDUyNTEwMDAwMFowCgYIKoZIzj0EAwIDSAAwRQIgPKt0CxtdxWA2iH6tcQzAvoHDRAnd5LvzSQp6+mx6n6ACIQDpUeZBNEENn08kU9DIjaKeyAw79MQpqAu/KbQnqIj79w==",
-		"VALIDATIONCLOCK": "2021-06-25T14:52:41.345203Z"
+		"VALIDATIONCLOCK": "2021-06-27T09:00:14.984040Z"
 	},
     "EXPECTEDRESULTS": {
         "EXPECTEDVALIDOBJECT": true,
diff --git a/SI/2DCode/raw/test-AG.json b/SI/2DCode/raw/test-AG.json
index 02e93330..6721fa3d 100644
--- a/SI/2DCode/raw/test-AG.json
+++ b/SI/2DCode/raw/test-AG.json
@@ -7,33 +7,33 @@
 			"gn": "JOZA",
 			"gnt": "JOZA"
 		},
-		"dob": "1958-04-25",
+		"dob": "1959-07-22",
 		"t": [
 			{
 				"tg": "840539006",
 				"tt": "LP217198-3",
-				"nm": "AMEDA Labordiagnostik GmbH, AMP Rapid Test SARS-CoV-2 Ag",
-				"sc": "2021-06-18T06:32:56Z",
+				"ma": "1304",
+				"sc": "2021-06-29T12:46:39Z",
 				"tr": "260415000",
 				"tc": "Ni podatka",
 				"co": "SI",
 				"is": "Nacionalni inštitut za javno zdravje",
-				"ci": "URN:UVCI:01:SI:C584E6E223B66F67E053#Q"
+				"ci": "URN:UVCI:01:SI:C5E8734F3DF9B66CE053#D"
 			}
 		]
 	},
-	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313935382d30342d3235617481bf627467693834303533393030366274746a4c503231373139382d33626e6d7838414d454441204c61626f72646961676e6f7374696b20476d62482c20414d50205261706964205465737420534152532d436f562d3220416762736374323032312d30362d31385430363a33323a35365a627472693236303431353030306274636a4e6920706f6461746b6162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626369782555524e3a555643493a30313a53493a43353834453645323233423636463637453035332351ffff",
-	"COSE": "d2844da20126044882db104d1f3657aca0590148a401625349041a614b4383061a60d49c83390103a101a4617481a9626369782555524e3a555643493a30313a53493a4335383445364532323342363646363745303533235162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626e6d7838414d454441204c61626f72646961676e6f7374696b20476d62482c20414d50205261706964205465737420534152532d436f562d3220416762736374323032312d30362d31385430363a33323a35365a6274636a4e6920706f6461746b6162746769383430353339303036627472693236303431353030306274746a4c503231373139382d3363646f626a313935382d30342d3235636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e305840bc6a09a5e6a84c3035f5d3e11976c20ba9c835f7d8427e87c12f58228e38840bffc354ee76c83a550067c3638c621b31a7f28dae93a480772159369e5450021c",
-	"COMPRESSED": "78da3d8e3d4b1c410040b351846063ab111c13b4727566f676dcdb2aeb797aa77797f33efcaa32337baeb3e666e56e5c0f0bf10b6cd4c65644e54405f117d8a808d68985902a4dca148190321e08560f5ef178dfb6d2275a6f7362e3475bba8b4c5d1ecd6889bac6f2c9e60e3a1edb6ce9f8f278b019d59a8eb53a55eb178c8b5a4f3197b18b93b1a40d919d4fda31d38ac4491c6363889011321887a6f17182f1a05161a25aebc9502e0249bf4a0184bc3f56422d29b042814f43198015b74243bfc464b96639e9f8b0035294051557504f06552516c0689925fa8093ce821c5d142e2894aa0ae49d5c5e8f05933a068ec7aa5c6188910e898eac0224b6816d93cc32c5fd8c008b814bd50265ca1356a47117859030551198c0083221844c293f95c56810452ddde06ec07c14352d1d46746c7249cb753627e7478ba9e4f8e7598779d21d6b90cf49f52ab927d58b0d4b9512ea37fae1f4a76bffdde9aff31434ff7effd91edeb65e3c98ff9e8656b76f06a63fec595badffef0abfc307bbf8c6bbe33bec3d3afbb37bb55f5f5bee9e218785ecdbce6701fd8e6f",
-	"BASE45": "NCF8Z7VX7XP3J105UM3XG0RCF724M26LEX0D81F VRQYTYMFF5FZXUH.VQF6RSFJXMG0D$.DQ+1CLU5YDE3P.V8/Q8OLUOHRC51FHH6AIO$9TQ2EAI%Z3Q*A50CSCF25N*/414EPMC.09AQNJT9A+3V9DORN8VUY3TSF7CXR1QTHTU BM70R%1I%G7IWTOYHYIB5C61KM9UICXKHIIC4AKD6JOH-A9IPC+BH$72O43W4LXFEQOU/CARNKG T66A0D0A8OS80-ZNW+A-V5WCMSFGWL8T8GO7NIP8B$OWJNKE7YJV+I03WIIV2*6A1 0:U4QEOAGJ3UV%UI8KGNYBQ$5XZI/G19+J..BWV04F7B2I7OL%EC9FIOHHOXL%S4DGG UI$I6I2W430OFGZ-Q3*C0K2MZK /2CAI.XA:DJS11UA4CS9W181/OP22-Z5YGS1FO/O2TV5 +8.VD E9  E025029MLL:KVEEB1IFGW3 DIXF92I5R152QH:O9RH2K37JPSJ7LQFWIOT%WUMV6L2G7KR:6S4-BHFJ$1KE/AR1EY0LP*TOQB:FW6G1MTOFYNP5PVWS.%TOK72VM -ML2CL7UXA4*-GKZR:0DK2WL2",
-	"PREFIX": "HC1:NCF8Z7VX7XP3J105UM3XG0RCF724M26LEX0D81F VRQYTYMFF5FZXUH.VQF6RSFJXMG0D$.DQ+1CLU5YDE3P.V8/Q8OLUOHRC51FHH6AIO$9TQ2EAI%Z3Q*A50CSCF25N*/414EPMC.09AQNJT9A+3V9DORN8VUY3TSF7CXR1QTHTU BM70R%1I%G7IWTOYHYIB5C61KM9UICXKHIIC4AKD6JOH-A9IPC+BH$72O43W4LXFEQOU/CARNKG T66A0D0A8OS80-ZNW+A-V5WCMSFGWL8T8GO7NIP8B$OWJNKE7YJV+I03WIIV2*6A1 0:U4QEOAGJ3UV%UI8KGNYBQ$5XZI/G19+J..BWV04F7B2I7OL%EC9FIOHHOXL%S4DGG UI$I6I2W430OFGZ-Q3*C0K2MZK /2CAI.XA:DJS11UA4CS9W181/OP22-Z5YGS1FO/O2TV5 +8.VD E9  E025029MLL:KVEEB1IFGW3 DIXF92I5R152QH:O9RH2K37JPSJ7LQFWIOT%WUMV6L2G7KR:6S4-BHFJ$1KE/AR1EY0LP*TOQB:FW6G1MTOFYNP5PVWS.%TOK72VM -ML2CL7UXA4*-GKZR:0DK2WL2",
-	"2DCODE": "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",
+	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313935392d30372d3232617481bf627467693834303533393030366274746a4c503231373139382d33626d61643133303462736374323032312d30362d32395431323a34363a33395a627472693236303431353030306274636a4e6920706f6461746b6162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626369782555524e3a555643493a30313a53493a43354538373334463344463942363643453035332344ffff",
+	"COSE": "d2844da20126044882db104d1f3657aca0590113a401625349041a646f71bb061a60db1f94390103a101a4617481a9626369782555524e3a555643493a30313a53493a4335453837333446334446394236364345303533234462636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626d61643133303462736374323032312d30362d32395431323a34363a33395a6274636a4e6920706f6461746b6162746769383430353339303036627472693236303431353030306274746a4c503231373139382d3363646f626a313935392d30372d3232636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e305840fc240663765ed6c3c955dc71bca7b6ee67fa5b4f0448921b1c69d0ebd974e98de20637d410c360b6af8c72683310f0590ff4dd61835ccd52bfd5c9131a2fe379",
+	"COMPRESSED": "78dabbd4e2bb88518dc5a3e9b680afbc59f89a05918cc24b1893823d59a452f20b77b34925dc969f62c9c8bc9071496249e3caa4e4cc0ad5d0203fabd030674f2b0343ab604f2b6753570b736313376317374b27333367570353636597a4e47ca0294999c515aa7e89c999f979893979990a9979471796649694962854252a642596e5e52b54a514259665a526e526a6181a1b982415279718191819ea1a98e91a5986181a59999859195b4625952467f9652a14e4a7249664272695a4675a98002db23430304b2a29ca343233303134353030482a29c9f20930323437b4b4d0354e4ec94fca32b434b5d43530d735324ace4bcc5d92949697e11eeae3e9ed1fe598949e97e205a493d3f24ae082c9e9792510d1b2d4a254433d633d8308873f2a6cc96571d70e9f0cbd53b867f9b677e9bfa2fd593c2649cb645e787db3e465ef2336f32b028713b6adef29ca3016f810c9ffe56e6273ccd9a0fd574f0a4be93fae0400b1b7802f",
+	"BASE45": "NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0IIEPO 43-KG/EB*LAAK1.TMHZ4*1J:LC/GPWBILC9FF9 RPR-SSG10EQ928GEQW2DVJ5/O8+7C-L55OA6K1SNC4073.2OM9CL6+2D-I0KPCU7J$*S6BKVD98-O-OL%IH.KJIGF/B7SFJ4IJJ:8P0JS1JA:IVSA7G5$X4%2TML55*K$X4B%CC-4**4523:L3CP4A05423423ZQT+EJ+E3%.G+E3ZIJ*BBBOB X44R4ZNVHE5Z+S6S4YTCM*4CZKHKB010ZNM646RM9XC5.Q69L6-96QW6U46%E5%NPC71RF6+17S%MBX69/9-3AKI6%T6A$Q%76SW6PK99Q9E$BDZI19J*+3P S//T61TLZI29J4W0/UIGSU9HSTNP8EFU52FRMLNKNM8POCJPGI4HFG5WKPSHE8%1LR1CQAM6D13NYOTARKTCB $43WPJ.B4+FE*SJAUR.6UJ5J3HA4NPAUAPPU+2M52YFW/.DYSE2NRA1WT:9%Q9C28YM00LMA9G",
+	"PREFIX": "HC1:NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0IIEPO 43-KG/EB*LAAK1.TMHZ4*1J:LC/GPWBILC9FF9 RPR-SSG10EQ928GEQW2DVJ5/O8+7C-L55OA6K1SNC4073.2OM9CL6+2D-I0KPCU7J$*S6BKVD98-O-OL%IH.KJIGF/B7SFJ4IJJ:8P0JS1JA:IVSA7G5$X4%2TML55*K$X4B%CC-4**4523:L3CP4A05423423ZQT+EJ+E3%.G+E3ZIJ*BBBOB X44R4ZNVHE5Z+S6S4YTCM*4CZKHKB010ZNM646RM9XC5.Q69L6-96QW6U46%E5%NPC71RF6+17S%MBX69/9-3AKI6%T6A$Q%76SW6PK99Q9E$BDZI19J*+3P S//T61TLZI29J4W0/UIGSU9HSTNP8EFU52FRMLNKNM8POCJPGI4HFG5WKPSHE8%1LR1CQAM6D13NYOTARKTCB $43WPJ.B4+FE*SJAUR.6UJ5J3HA4NPAUAPPU+2M52YFW/.DYSE2NRA1WT:9%Q9C28YM00LMA9G",
+	"2DCODE": "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",
 	"TESTCTX": {
-		"validationClockInstant": "2021-06-25T14:53:55.928623Z",
+		"validationClockInstant": "2021-06-30T13:26:44.665592Z",
 		"VERSION": 1,
 		"SCHEMA": "1.3.0",
 		"CERTIFICATE": "MIIC6DCCAo6gAwIBAgIUfl5c6SqMnjlKdOrSZdocRXqRQ/kwCgYIKoZIzj0EAwIwgaYxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczE8MDoGA1UEAwwzU2xvdmVuaWFuIEFjY2VwdGFuY2UgRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBDU0NBMB4XDTIxMDUyNTE0MzMzMVoXDTIzMDUyNTE0MzMzMVowgYgxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEeMBwGA1UEAwwVREdDIEFjY2VwdGFuY2UgU2lnbmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEp7NEJHAyIVwZPfB5bvz4756ICGwhOn5iRhWJHuREQSvtGpQfVK20PgMTTgUCmYQBkSw5mlKgpRNcn2RVnGEAHqOBtTCBsjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFHdI8JFtk93CuAGHO8hAf4EDLkw5MB8GA1UdIwQYMBaAFO+TWyMgX3mwQCOTolTEpG4BKPGeMDMGA1UdJQQsMCoGDCsGAQQBAI43j2UBAQYMKwYBBAEAjjePZQECBgwrBgEEAQCON49lAQMwKwYDVR0QBCQwIoAPMjAyMTA1MjUxMDAwMDBagQ8yMDIyMDUyNTEwMDAwMFowCgYIKoZIzj0EAwIDSAAwRQIgPKt0CxtdxWA2iH6tcQzAvoHDRAnd5LvzSQp6+mx6n6ACIQDpUeZBNEENn08kU9DIjaKeyAw79MQpqAu/KbQnqIj79w==",
-		"VALIDATIONCLOCK": "2021-06-25T14:53:55.928623Z"
+		"VALIDATIONCLOCK": "2021-06-30T13:26:44.665592Z"
 	},
     "EXPECTEDRESULTS": {
         "EXPECTEDVALIDOBJECT": true,
diff --git a/SI/2DCode/raw/test-PCR.json b/SI/2DCode/raw/test-PCR.json
index 203737b0..0ee1acde 100644
--- a/SI/2DCode/raw/test-PCR.json
+++ b/SI/2DCode/raw/test-PCR.json
@@ -7,32 +7,32 @@
 			"gn": "JOZA",
 			"gnt": "JOZA"
 		},
-		"dob": "1965-11-06",
+		"dob": "1967-10-21",
 		"t": [
 			{
 				"tg": "840539006",
 				"tt": "LP6464-4",
-				"sc": "2021-06-16T22:00:00Z",
+				"sc": "2021-06-28T22:00:00Z",
 				"tr": "260415000",
 				"tc": "Ni podatka",
 				"co": "SI",
 				"is": "Nacionalni inštitut za javno zdravje",
-				"ci": "URN:UVCI:01:SI:C585251453006F0DE053#Q"
+				"ci": "URN:UVCI:01:SI:C5E8734F3DF8B66CE053#F"
 			}
 		]
 	},
-	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313936352d31312d3036617481bf62746769383430353339303036627474684c50363436342d3462736374323032312d30362d31365432323a30303a30305a627472693236303431353030306274636a4e6920706f6461746b6162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626369782555524e3a555643493a30313a53493a43353835323531343533303036463044453035332351ffff",
-	"COSE": "d2844da20126044882db104d1f3657aca0590109a401625349041a614b439f061a60d49c9f390103a101a4617481a8626369782555524e3a555643493a30313a53493a4335383532353134353330303646304445303533235162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a6562736374323032312d30362d31365432323a30303a30305a6274636a4e6920706f6461746b616274676938343035333930303662747269323630343135303030627474684c50363436342d3463646f626a313936352d31312d3036636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e305840c341fafe9fac80e702d21cdd165e2a3c72128696625ab87e63a6b3c3e4f1ac64c2b43d2d5d11630e1445279b7322899a98dac03bf54806edb76f31162c51dfea",
-	"COMPRESSED": "78dabbd4e2bb88518dc5a3e9b680afbc59f89a05918c9c4b1893823d59a412bd9de7b349255c9933df92917921e392c492c61549c99915aaa1417e56a161ce9e56068656c19e56cea616a646a68626a6c60606666e062eae06a6c6ca8149c9f9405392328b2b54fd129333f3f31273f2321532f38e2e2cc92c292d51a84a54c84a2ccbcb57a84a294a2ccb4a4d2a4e2e31323032d43530d335340b3132b2323000a2a8a492e42cbf4c8582fc94c492ecc4a492f44c0b13a0059640bb924a8a328dcc0c4c0c4d0d0c0c924a4a327c02cc4ccc4c744d9253f293b20c2dcd4c750d41e625e725e62e494acbcb700ff5f1f4f68f724c4acf4bf102d2c969792570c1e4f4bc128868596a51aaa19eb19e4184c361c75fffe6af6978ce7449e6ae589c964d9150dbb4a4a81d75c9cb361f7ef2714dcaa12db6bab182c97c22aeeab38b953a67cdb875c0faab07dbdbedf986623a81f75f0100e13b7af3",
-	"BASE45": "NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0II6YJ 43-KG/EBRG2D/J.TMOW4OGJ*BSQHIZC4.OI:OI4V2*LPBX2GHKW/F3IKJ5QH*AA:GLLO$/A%:K-0LF2L**4O1PI 0-+DP+5$$0+5PMFG0OP.58VLIWQHMXAUF2OP6 WURTE-E6%J6%/HZT5AQ5 W5HCLEWA/G9GYPU3B+G9/G9MVP:X9Y*9*96846A$QY76UW6UI1II6NF6R30HELTPIPT5EU97PGE I$PIU%O0QIRR9TL2ZV0B88AMI8LHU-H/O1:O1AT1NQ1SH99H6-F0+V9.T9D 9PRAAUICO1-.P+ZE+E8SZ4RZ4E%5MK9FWPZ02KQUT7VAKEQK91R92G0 KP8EFKBEM.S-YN0BHUDBQEAJJKKKMWC8MVO99PZFW+7MBCFOVEE7T49B20JUGI*YRW KQW3:MP+$682GPEEXRP2Z53RN1OG8VF35MIVM.%IN5DGEN$HO/RLXZR 3UM:G$H7CCVV50ELSKOF",
-	"PREFIX": "HC1:NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0II6YJ 43-KG/EBRG2D/J.TMOW4OGJ*BSQHIZC4.OI:OI4V2*LPBX2GHKW/F3IKJ5QH*AA:GLLO$/A%:K-0LF2L**4O1PI 0-+DP+5$$0+5PMFG0OP.58VLIWQHMXAUF2OP6 WURTE-E6%J6%/HZT5AQ5 W5HCLEWA/G9GYPU3B+G9/G9MVP:X9Y*9*96846A$QY76UW6UI1II6NF6R30HELTPIPT5EU97PGE I$PIU%O0QIRR9TL2ZV0B88AMI8LHU-H/O1:O1AT1NQ1SH99H6-F0+V9.T9D 9PRAAUICO1-.P+ZE+E8SZ4RZ4E%5MK9FWPZ02KQUT7VAKEQK91R92G0 KP8EFKBEM.S-YN0BHUDBQEAJJKKKMWC8MVO99PZFW+7MBCFOVEE7T49B20JUGI*YRW KQW3:MP+$682GPEEXRP2Z53RN1OG8VF35MIVM.%IN5DGEN$HO/RLXZR 3UM:G$H7CCVV50ELSKOF",
-	"2DCODE": "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",
+	"CBOR": "bf6376657265312e332e30636e616dbf62666e6847554c494b4f5a4163666e746847554c494b4f5a4162676e644a4f5a4163676e74644a4f5a41ff63646f626a313936372d31302d3231617481bf62746769383430353339303036627474684c50363436342d3462736374323032312d30362d32385432323a30303a30305a627472693236303431353030306274636a4e6920706f6461746b6162636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a65626369782555524e3a555643493a30313a53493a43354538373334463344463842363643453035332346ffff",
+	"COSE": "d2844da20126044882db104d1f3657aca0590109a401625349041a646f71bb061a60db1f69390103a101a4617481a8626369782555524e3a555643493a30313a53493a4335453837333446334446384236364345303533234662636f62534962697378254e6163696f6e616c6e6920696ec5a17469747574207a61206a61766e6f207a647261766a6562736374323032312d30362d32385432323a30303a30305a6274636a4e6920706f6461746b616274676938343035333930303662747269323630343135303030627474684c50363436342d3463646f626a313936372d31302d3231636e616da462666e6847554c494b4f5a4162676e644a4f5a4163666e746847554c494b4f5a4163676e74644a4f5a416376657265312e332e305840f14358077f4724290e6a296792969f19fc4097aa923a987dbd2511b7a72fc136ecce5abc9c9b2dda27d9c78d46717631b53ea60a6cd43e33830a42846854fb3c",
+	"COMPRESSED": "78dabbd4e2bb88518dc5a3e9b680afbc59f89a05918c9c4b1893823d59a452f20b77b34925dc96cfb464645ec8b824b1a47145527266856a68909f556898b3a79581a155b0a795b3a9ab85b9b1899bb18b9b85939999b3ab81a9b1b25b52723ed094a4cce20a55bfc4e4ccfcbcc49cbc4c85ccbca30b4b324b4a4b14aa1215b212cbf2f215aa528a12cbb252938a934b8c0c8c0c750dcc748d2c428c8cac0c0c80282aa92439cb2f53a1203f25b1243b31a9243dd3c2046881a5818159524951a691998189a1a9818141524949864f8099899989ae49724a7e5296a1a599b9aea181ae9161725e62ee92a4b4bc0cf7501f4f6fff28c7a4f4bc142f209d9c965702174c4ecf2b818896a516a51aea19eb1944387c748e60af7757d1e4cbd24c9f346dbee41f87e9ab2659cda8ddab2ab87db9fe41b337e7a2f6cc99ad7b4bfde6f15eb7c232c3ad76cbb872aed819377339b56484fcb601006a787894",
+	"BASE45": "NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0II6YJ 43-KG/EB*LAAK1.TMHZ4.2JA M:UC*GPXS4MZKGY8 KE:%G%9DJ6K1AD1WMN+I HK/EMS-IAKLX+G:JMWUJ9TH+*G IJ5WMSHG+KMNOB-JEQGQN$K-PS $A4+O6-P*%NT JEU9W*PORKZM9EN95M9NMLJX2-G24WUBX2PJA-G2KOMFTI.RIWVHWVH+ZE5%P5%HQI8CZHON139GVH53Q4+UPYPAK34JY45Q4NC67Q4UYQ3P0OHGXGG6DB4C9Q2LCIJ/HHDJLEFG5IACD9C2AKIJKIJM1M8KES/F-1J3.KELNZIK43MGEC.-B97U: KZYN.BV5/367E:65I%K/YN4/5S-JC0J+B04T9P8Q+GG02J$%25I3KC3X83F673XE1AC-3F2OQNYP+U9BS6/5OG:3EOT7%4/:P21S1I5A+FJ6WOTMXCT09VBJJIQFI4W5NUHANZI6 -L.XPIMEGERK07DD7$VCT.VV50VKD/AF",
+	"PREFIX": "HC1:NCFOXN%TSMAHN-HLWKA3NX9M$GB9LJ0II6YJ 43-KG/EB*LAAK1.TMHZ4.2JA M:UC*GPXS4MZKGY8 KE:%G%9DJ6K1AD1WMN+I HK/EMS-IAKLX+G:JMWUJ9TH+*G IJ5WMSHG+KMNOB-JEQGQN$K-PS $A4+O6-P*%NT JEU9W*PORKZM9EN95M9NMLJX2-G24WUBX2PJA-G2KOMFTI.RIWVHWVH+ZE5%P5%HQI8CZHON139GVH53Q4+UPYPAK34JY45Q4NC67Q4UYQ3P0OHGXGG6DB4C9Q2LCIJ/HHDJLEFG5IACD9C2AKIJKIJM1M8KES/F-1J3.KELNZIK43MGEC.-B97U: KZYN.BV5/367E:65I%K/YN4/5S-JC0J+B04T9P8Q+GG02J$%25I3KC3X83F673XE1AC-3F2OQNYP+U9BS6/5OG:3EOT7%4/:P21S1I5A+FJ6WOTMXCT09VBJJIQFI4W5NUHANZI6 -L.XPIMEGERK07DD7$VCT.VV50VKD/AF",
+	"2DCODE": "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",
 	"TESTCTX": {
-		"validationClockInstant": "2021-06-25T14:54:23.333662Z",
+		"validationClockInstant": "2021-06-30T13:26:01.266495Z",
 		"VERSION": 1,
 		"SCHEMA": "1.3.0",
 		"CERTIFICATE": "MIIC6DCCAo6gAwIBAgIUfl5c6SqMnjlKdOrSZdocRXqRQ/kwCgYIKoZIzj0EAwIwgaYxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczE8MDoGA1UEAwwzU2xvdmVuaWFuIEFjY2VwdGFuY2UgRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBDU0NBMB4XDTIxMDUyNTE0MzMzMVoXDTIzMDUyNTE0MzMzMVowgYgxCzAJBgNVBAYTAlNJMSwwKgYDVQQKDCNOYXRpb25hbCBpbnN0aXR1dGUgb2YgcHVibGljIEhlYWx0aDErMCkGA1UECwwiRGlnaXRhbCBHcmVlbiBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEeMBwGA1UEAwwVREdDIEFjY2VwdGFuY2UgU2lnbmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEp7NEJHAyIVwZPfB5bvz4756ICGwhOn5iRhWJHuREQSvtGpQfVK20PgMTTgUCmYQBkSw5mlKgpRNcn2RVnGEAHqOBtTCBsjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFHdI8JFtk93CuAGHO8hAf4EDLkw5MB8GA1UdIwQYMBaAFO+TWyMgX3mwQCOTolTEpG4BKPGeMDMGA1UdJQQsMCoGDCsGAQQBAI43j2UBAQYMKwYBBAEAjjePZQECBgwrBgEEAQCON49lAQMwKwYDVR0QBCQwIoAPMjAyMTA1MjUxMDAwMDBagQ8yMDIyMDUyNTEwMDAwMFowCgYIKoZIzj0EAwIDSAAwRQIgPKt0CxtdxWA2iH6tcQzAvoHDRAnd5LvzSQp6+mx6n6ACIQDpUeZBNEENn08kU9DIjaKeyAw79MQpqAu/KbQnqIj79w==",
-		"VALIDATIONCLOCK": "2021-06-25T14:54:23.333662Z"
+		"VALIDATIONCLOCK": "2021-06-30T13:26:01.266495Z"
 	},
     "EXPECTEDRESULTS": {
         "EXPECTEDVALIDOBJECT": true,
diff --git a/SI/README.md b/SI/README.md
index dd6bc322..9d4868fd 100644
--- a/SI/README.md
+++ b/SI/README.md
@@ -28,7 +28,7 @@ All tests should be successful.
 
 All tests should be successful.
 
-![TEST-AG](png/TEST-AG.png)
+![TEST-AG](png/test-AG.png)
 
 ### TEST PCR
 
@@ -36,5 +36,5 @@ All tests should be successful.
 
 All tests should be successful.
 
-![TEST-PCR](png/TEST-PCR.png)
+![TEST-PCR](png/test-PCR.png)
 
diff --git a/SI/png/REC.PNG b/SI/png/REC.PNG
deleted file mode 100644
index 2d89a65d..00000000
Binary files a/SI/png/REC.PNG and /dev/null differ
diff --git a/SI/png/REC.png b/SI/png/REC.png
new file mode 100644
index 00000000..8a50db7b
Binary files /dev/null and b/SI/png/REC.png differ
diff --git a/SI/png/TEST-AG.PNG b/SI/png/TEST-AG.PNG
deleted file mode 100644
index 9ecfa9eb..00000000
Binary files a/SI/png/TEST-AG.PNG and /dev/null differ
diff --git a/SI/png/TEST-PCR.PNG b/SI/png/TEST-PCR.PNG
deleted file mode 100644
index 16d0925a..00000000
Binary files a/SI/png/TEST-PCR.PNG and /dev/null differ
diff --git a/SI/png/VAC.PNG b/SI/png/VAC.PNG
deleted file mode 100644
index ee9aa89e..00000000
Binary files a/SI/png/VAC.PNG and /dev/null differ
diff --git a/SI/png/VAC.png b/SI/png/VAC.png
new file mode 100644
index 00000000..4bdaf114
Binary files /dev/null and b/SI/png/VAC.png differ
diff --git a/SI/png/test-AG.png b/SI/png/test-AG.png
new file mode 100644
index 00000000..c1977942
Binary files /dev/null and b/SI/png/test-AG.png differ
diff --git a/SI/png/test-PCR.png b/SI/png/test-PCR.png
new file mode 100644
index 00000000..d18878a2
Binary files /dev/null and b/SI/png/test-PCR.png differ