diff --git a/testdata/irma_configuration/irma-demo/MijnOverheid/PrivateKeys/2.xml b/testdata/irma_configuration/irma-demo/MijnOverheid/PrivateKeys/2.xml
index 4ed493897..8c3181f38 100644
--- a/testdata/irma_configuration/irma-demo/MijnOverheid/PrivateKeys/2.xml
+++ b/testdata/irma_configuration/irma-demo/MijnOverheid/PrivateKeys/2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <IssuerPrivateKey xmlns="http://www.zurich.ibm.com/security/idemix">
    <Counter>2</Counter>
-   <ExpiryDate>1701158935</ExpiryDate>
+   <ExpiryDate>1893456000</ExpiryDate>
    <Elements>
       <p>13036339433123178695908840718693802387273238390027469247345874094751305273134807038816139581102847083730727231542711038345391167471004335082018488248974379</p>
       <q>10088624216597235614359922948511530483820114010252811975869427121586007859448455885157851236285347991436572481921557340357935389379891520302085231666994379</q>
diff --git a/testdata/irma_configuration/irma-demo/MijnOverheid/PublicKeys/2.xml b/testdata/irma_configuration/irma-demo/MijnOverheid/PublicKeys/2.xml
index bf4841b8e..46480fdc4 100644
--- a/testdata/irma_configuration/irma-demo/MijnOverheid/PublicKeys/2.xml
+++ b/testdata/irma_configuration/irma-demo/MijnOverheid/PublicKeys/2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <IssuerPublicKey xmlns="http://www.zurich.ibm.com/security/idemix">
    <Counter>2</Counter>
-   <ExpiryDate>1701158935</ExpiryDate>
+   <ExpiryDate>1893456000</ExpiryDate>
    <Elements>
       <n>131518729700787979292787041895750802768851733276193568585406403949922070418838957152154629588354823920318658839447335739064119607195862347255748540075851885047700965997624853955765192081166353202068833326864182004832768436522095641050131429160471374715101116450522325345160992063942232667126429440012308015641</n>
       <Z>4135970627975959617799401104710128345943386658128521465906716521927182034780472896591869715003404257158824049871172152695493659929402062056825095364469550099884639262205550966792163355022230743378504064454663740130822834246844551841114244786186452697877677839213171183600121017230408510579686269890901856901</Z>
diff --git a/testdata/irma_configuration/irma-demo/index b/testdata/irma_configuration/irma-demo/index
index 2f8f50f1c..548bdae1b 100644
--- a/testdata/irma_configuration/irma-demo/index
+++ b/testdata/irma_configuration/irma-demo/index
@@ -6,7 +6,7 @@
 61a1fc7f161e43f8fc5b0c6ac2997cfe6bc0da7d27009b9914a04dca79ec6718 irma-demo/MijnOverheid/Issues/singleton/logo.png
 3571e30777cdf5b97acbb0820f1b69983d2dc2b6bae91c8fb67cfc79ef4e2543 irma-demo/MijnOverheid/PublicKeys/0.xml
 cd56a93573bfeff2039e8e6122b9a2c13dd4a574c1a27df94564eadcccd3ab48 irma-demo/MijnOverheid/PublicKeys/1.xml
-074a8295e94a1c5fca89835421a50e2a7fc03c2a3a5dc95e20865c45309e0117 irma-demo/MijnOverheid/PublicKeys/2.xml
+65613190b73d98f34f4bcd2f4849a3a75422cd0f245a370b77ef041873efe940 irma-demo/MijnOverheid/PublicKeys/2.xml
 5ca41bfe7b35024e2c423208b38f035c0d25660ddd059ab595bd3c051074d13e irma-demo/MijnOverheid/description.xml
 d81eeb49a992cbb9107cbec5304a8aaf9a932d1c9564510e76460036f69a083f irma-demo/MijnOverheid/logo.png
 763f59d9bb02274a79e6dfe4f2c2b0940b50a149b8915c8b2a5309973fbb5c57 irma-demo/RU/Issues/studentCard/description.xml
@@ -22,4 +22,4 @@ dbd465d9cdb1c64206443e425fb1f8950605aee35e77f1e8bcf6cca8c34b8b65 irma-demo/RU/Pu
 7657171e97f6c327ba6e4040c291e014258dfb720050e195f6acb95b14582bb5 irma-demo/stemmen/PublicKeys/0.xml
 611a4d2a9e858b5b76ff3642ac9f67ed21121d6fc4ec0df802186b0c6e6d5c5b irma-demo/stemmen/description.xml
 1a1078dcd7d22e4a30ab34d53a7509256196a470baa883a92c99c073c40690af irma-demo/stemmen/logo.png
-3c3c21b8e74917894c3e8dd7d4cc3affc22b37f0aab199d7bfc0956fbb9b7245 irma-demo/timestamp
+206095f051b9395747dc68881ad390b9211b4991dbfacc2466fdd918838ba150 irma-demo/timestamp
diff --git a/testdata/irma_configuration/irma-demo/index.sig b/testdata/irma_configuration/irma-demo/index.sig
index bcf36b5fe..fbcfa52a6 100644
Binary files a/testdata/irma_configuration/irma-demo/index.sig and b/testdata/irma_configuration/irma-demo/index.sig differ
diff --git a/testdata/irma_configuration/irma-demo/timestamp b/testdata/irma_configuration/irma-demo/timestamp
index 8f4f1c4e0..81ccfe206 100644
--- a/testdata/irma_configuration/irma-demo/timestamp
+++ b/testdata/irma_configuration/irma-demo/timestamp
@@ -1 +1 @@
-1696329067
+1701185680
diff --git a/testdata/irma_configuration/test-requestors/index b/testdata/irma_configuration/test-requestors/index
index 3f1c2830b..bb33d6030 100644
--- a/testdata/irma_configuration/test-requestors/index
+++ b/testdata/irma_configuration/test-requestors/index
@@ -1,3 +1,3 @@
 e870f28cd43899e077be26cb2465a562c594fda8c956cc8cb3d2f6f9a4074806 test-requestors/description.json
 54415d17b6961392b28b6b49ed29f13308e24e82848ea9f93c470afd38715aec test-requestors/requestors.json
-3c3c21b8e74917894c3e8dd7d4cc3affc22b37f0aab199d7bfc0956fbb9b7245 test-requestors/timestamp
+206095f051b9395747dc68881ad390b9211b4991dbfacc2466fdd918838ba150 test-requestors/timestamp
diff --git a/testdata/irma_configuration/test-requestors/index.sig b/testdata/irma_configuration/test-requestors/index.sig
index 037ee1748..8d3499922 100644
Binary files a/testdata/irma_configuration/test-requestors/index.sig and b/testdata/irma_configuration/test-requestors/index.sig differ
diff --git a/testdata/irma_configuration/test-requestors/timestamp b/testdata/irma_configuration/test-requestors/timestamp
index 8f4f1c4e0..81ccfe206 100644
--- a/testdata/irma_configuration/test-requestors/timestamp
+++ b/testdata/irma_configuration/test-requestors/timestamp
@@ -1 +1 @@
-1696329067
+1701185680
diff --git a/testdata/irma_configuration/test/index b/testdata/irma_configuration/test/index
index 8540bca68..10a57d762 100644
--- a/testdata/irma_configuration/test/index
+++ b/testdata/irma_configuration/test/index
@@ -20,4 +20,4 @@ debfcb4464b40e3e1af8674ed23c0e52803fa9ab37fef8fbcd864843fb4fb0d8 test/test2/Publ
 c39bb3dad87770f381be3185e80219402cfc997a2565b2e9c26e1b715b35a964 test/test2/PublicKeys/1.xml
 5a5322a3a03f8f8c54ecde159f9b4a8414020c06d83095262bf86ba614e21ae7 test/test2/description.xml
 48f04181af6874a2f63f97d0a1a79b95f274da3e4d0efd9e5936b0ec0858b1cc test/test2/logo.png
-3c3c21b8e74917894c3e8dd7d4cc3affc22b37f0aab199d7bfc0956fbb9b7245 test/timestamp
+206095f051b9395747dc68881ad390b9211b4991dbfacc2466fdd918838ba150 test/timestamp
diff --git a/testdata/irma_configuration/test/index.sig b/testdata/irma_configuration/test/index.sig
index 59466609d..0d5664642 100644
Binary files a/testdata/irma_configuration/test/index.sig and b/testdata/irma_configuration/test/index.sig differ
diff --git a/testdata/irma_configuration/test/timestamp b/testdata/irma_configuration/test/timestamp
index 8f4f1c4e0..81ccfe206 100644
--- a/testdata/irma_configuration/test/timestamp
+++ b/testdata/irma_configuration/test/timestamp
@@ -1 +1 @@
-1696329067
+1701185680
diff --git a/testdata/irma_configuration/test2/index b/testdata/irma_configuration/test2/index
index 89850ed0e..7971ca0e2 100644
--- a/testdata/irma_configuration/test2/index
+++ b/testdata/irma_configuration/test2/index
@@ -5,4 +5,4 @@ a9837033b571a866bab4bbe7433fefc47a81d6a1e19f571edefe5a3c6b81c5b5 test2/descripti
 d89313c9917bd2f32f4c10a33e92333c13ada499f5d3ae29c895934bc57e43d4 test2/test/PublicKeys/0.xml
 82d4ea5b2e0e81e9fa7004c2ce7ec130e78e2f38e80ce4da377fd46118b6000b test2/test/description.xml
 48f04181af6874a2f63f97d0a1a79b95f274da3e4d0efd9e5936b0ec0858b1cc test2/test/logo.png
-3c3c21b8e74917894c3e8dd7d4cc3affc22b37f0aab199d7bfc0956fbb9b7245 test2/timestamp
+206095f051b9395747dc68881ad390b9211b4991dbfacc2466fdd918838ba150 test2/timestamp
diff --git a/testdata/irma_configuration/test2/index.sig b/testdata/irma_configuration/test2/index.sig
index 07e936290..f5c213b7b 100644
Binary files a/testdata/irma_configuration/test2/index.sig and b/testdata/irma_configuration/test2/index.sig differ
diff --git a/testdata/irma_configuration/test2/timestamp b/testdata/irma_configuration/test2/timestamp
index 8f4f1c4e0..81ccfe206 100644
--- a/testdata/irma_configuration/test2/timestamp
+++ b/testdata/irma_configuration/test2/timestamp
@@ -1 +1 @@
-1696329067
+1701185680
diff --git a/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PrivateKeys/2.xml b/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PrivateKeys/2.xml
index 4ed493897..8c3181f38 100644
--- a/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PrivateKeys/2.xml
+++ b/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PrivateKeys/2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <IssuerPrivateKey xmlns="http://www.zurich.ibm.com/security/idemix">
    <Counter>2</Counter>
-   <ExpiryDate>1701158935</ExpiryDate>
+   <ExpiryDate>1893456000</ExpiryDate>
    <Elements>
       <p>13036339433123178695908840718693802387273238390027469247345874094751305273134807038816139581102847083730727231542711038345391167471004335082018488248974379</p>
       <q>10088624216597235614359922948511530483820114010252811975869427121586007859448455885157851236285347991436572481921557340357935389379891520302085231666994379</q>
diff --git a/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PublicKeys/2.xml b/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PublicKeys/2.xml
index bf4841b8e..46480fdc4 100644
--- a/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PublicKeys/2.xml
+++ b/testdata/irma_configuration_invalid/irma-demo/MijnOverheid/PublicKeys/2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <IssuerPublicKey xmlns="http://www.zurich.ibm.com/security/idemix">
    <Counter>2</Counter>
-   <ExpiryDate>1701158935</ExpiryDate>
+   <ExpiryDate>1893456000</ExpiryDate>
    <Elements>
       <n>131518729700787979292787041895750802768851733276193568585406403949922070418838957152154629588354823920318658839447335739064119607195862347255748540075851885047700965997624853955765192081166353202068833326864182004832768436522095641050131429160471374715101116450522325345160992063942232667126429440012308015641</n>
       <Z>4135970627975959617799401104710128345943386658128521465906716521927182034780472896591869715003404257158824049871172152695493659929402062056825095364469550099884639262205550966792163355022230743378504064454663740130822834246844551841114244786186452697877677839213171183600121017230408510579686269890901856901</Z>
diff --git a/testdata/irma_configuration_invalid/irma-demo/index b/testdata/irma_configuration_invalid/irma-demo/index
index 33712a161..65d9dacf4 100644
--- a/testdata/irma_configuration_invalid/irma-demo/index
+++ b/testdata/irma_configuration_invalid/irma-demo/index
@@ -6,7 +6,7 @@
 61a1fc7f161e43f8fc5b0c6ac2997cfe6bc0da7d27009b9914a04dca79ec6718 irma-demo/MijnOverheid/Issues/singleton/logo.png
 3571e30777cdf5b97acbb0820f1b69983d2dc2b6bae91c8fb67cfc79ef4e2543 irma-demo/MijnOverheid/PublicKeys/0.xml
 cd56a93573bfeff2039e8e6122b9a2c13dd4a574c1a27df94564eadcccd3ab48 irma-demo/MijnOverheid/PublicKeys/1.xml
-074a8295e94a1c5fca89835421a50e2a7fc03c2a3a5dc95e20865c45309e0117 irma-demo/MijnOverheid/PublicKeys/2.xml
+65613190b73d98f34f4bcd2f4849a3a75422cd0f245a370b77ef041873efe940 irma-demo/MijnOverheid/PublicKeys/2.xml
 5ca41bfe7b35024e2c423208b38f035c0d25660ddd059ab595bd3c051074d13e irma-demo/MijnOverheid/description.xml
 d81eeb49a992cbb9107cbec5304a8aaf9a932d1c9564510e76460036f69a083f irma-demo/MijnOverheid/logo.png
 763f59d9bb02274a79e6dfe4f2c2b0940b50a149b8915c8b2a5309973fbb5c57 irma-demo/RU/Issues/studentCard/description.xml
@@ -22,4 +22,4 @@ dbd465d9cdb1c64206443e425fb1f8950605aee35e77f1e8bcf6cca8c34b8b65 irma-demo/RU/Pu
 7657171e97f6c327ba6e4040c291e014258dfb720050e195f6acb95b14582bb5 irma-demo/stemmen/PublicKeys/0.xml
 611a4d2a9e858b5b76ff3642ac9f67ed21121d6fc4ec0df802186b0c6e6d5c5b irma-demo/stemmen/description.xml
 1a1078dcd7d22e4a30ab34d53a7509256196a470baa883a92c99c073c40690af irma-demo/stemmen/logo.png
-c6f3de9c1ef2480cb966cdc07aecb938a63d57bc71268fdfa818d1b00a87e0a2 irma-demo/timestamp
+b0f52d7b060357fdd315b68af38ca0967346697bb4aa4553325ddcd3961b7d3d irma-demo/timestamp
diff --git a/testdata/irma_configuration_invalid/irma-demo/index.sig b/testdata/irma_configuration_invalid/irma-demo/index.sig
index 189c6a788..7712d1a0c 100644
Binary files a/testdata/irma_configuration_invalid/irma-demo/index.sig and b/testdata/irma_configuration_invalid/irma-demo/index.sig differ
diff --git a/testdata/irma_configuration_invalid/irma-demo/timestamp b/testdata/irma_configuration_invalid/irma-demo/timestamp
index 6a946c026..768c63cb9 100644
--- a/testdata/irma_configuration_invalid/irma-demo/timestamp
+++ b/testdata/irma_configuration_invalid/irma-demo/timestamp
@@ -1 +1 @@
-1696329069
+1701185681
diff --git a/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PrivateKeys/2.xml b/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PrivateKeys/2.xml
index 4ed493897..8c3181f38 100644
--- a/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PrivateKeys/2.xml
+++ b/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PrivateKeys/2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <IssuerPrivateKey xmlns="http://www.zurich.ibm.com/security/idemix">
    <Counter>2</Counter>
-   <ExpiryDate>1701158935</ExpiryDate>
+   <ExpiryDate>1893456000</ExpiryDate>
    <Elements>
       <p>13036339433123178695908840718693802387273238390027469247345874094751305273134807038816139581102847083730727231542711038345391167471004335082018488248974379</p>
       <q>10088624216597235614359922948511530483820114010252811975869427121586007859448455885157851236285347991436572481921557340357935389379891520302085231666994379</q>
diff --git a/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PublicKeys/2.xml b/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PublicKeys/2.xml
index bf4841b8e..46480fdc4 100644
--- a/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PublicKeys/2.xml
+++ b/testdata/irma_configuration_updated/irma-demo/MijnOverheid/PublicKeys/2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <IssuerPublicKey xmlns="http://www.zurich.ibm.com/security/idemix">
    <Counter>2</Counter>
-   <ExpiryDate>1701158935</ExpiryDate>
+   <ExpiryDate>1893456000</ExpiryDate>
    <Elements>
       <n>131518729700787979292787041895750802768851733276193568585406403949922070418838957152154629588354823920318658839447335739064119607195862347255748540075851885047700965997624853955765192081166353202068833326864182004832768436522095641050131429160471374715101116450522325345160992063942232667126429440012308015641</n>
       <Z>4135970627975959617799401104710128345943386658128521465906716521927182034780472896591869715003404257158824049871172152695493659929402062056825095364469550099884639262205550966792163355022230743378504064454663740130822834246844551841114244786186452697877677839213171183600121017230408510579686269890901856901</Z>
diff --git a/testdata/irma_configuration_updated/irma-demo/index b/testdata/irma_configuration_updated/irma-demo/index
index e385984a8..257d7c0fd 100644
--- a/testdata/irma_configuration_updated/irma-demo/index
+++ b/testdata/irma_configuration_updated/irma-demo/index
@@ -6,7 +6,7 @@
 61a1fc7f161e43f8fc5b0c6ac2997cfe6bc0da7d27009b9914a04dca79ec6718 irma-demo/MijnOverheid/Issues/singleton/logo.png
 3571e30777cdf5b97acbb0820f1b69983d2dc2b6bae91c8fb67cfc79ef4e2543 irma-demo/MijnOverheid/PublicKeys/0.xml
 cd56a93573bfeff2039e8e6122b9a2c13dd4a574c1a27df94564eadcccd3ab48 irma-demo/MijnOverheid/PublicKeys/1.xml
-074a8295e94a1c5fca89835421a50e2a7fc03c2a3a5dc95e20865c45309e0117 irma-demo/MijnOverheid/PublicKeys/2.xml
+65613190b73d98f34f4bcd2f4849a3a75422cd0f245a370b77ef041873efe940 irma-demo/MijnOverheid/PublicKeys/2.xml
 5ca41bfe7b35024e2c423208b38f035c0d25660ddd059ab595bd3c051074d13e irma-demo/MijnOverheid/description.xml
 d81eeb49a992cbb9107cbec5304a8aaf9a932d1c9564510e76460036f69a083f irma-demo/MijnOverheid/logo.png
 95f324b274b41c95cfca1dfdeb2814a1bd8156f6d7a1ebe950633cefba347662 irma-demo/RU/Issues/studentCard/description.xml
@@ -22,4 +22,4 @@ bda92554305aaa5a442032bfbe95b4cc30d4c8cd3b682f11380a1e18deef6d22 irma-demo/stemm
 7657171e97f6c327ba6e4040c291e014258dfb720050e195f6acb95b14582bb5 irma-demo/stemmen/PublicKeys/0.xml
 611a4d2a9e858b5b76ff3642ac9f67ed21121d6fc4ec0df802186b0c6e6d5c5b irma-demo/stemmen/description.xml
 1a1078dcd7d22e4a30ab34d53a7509256196a470baa883a92c99c073c40690af irma-demo/stemmen/logo.png
-c6f3de9c1ef2480cb966cdc07aecb938a63d57bc71268fdfa818d1b00a87e0a2 irma-demo/timestamp
+b0f52d7b060357fdd315b68af38ca0967346697bb4aa4553325ddcd3961b7d3d irma-demo/timestamp
diff --git a/testdata/irma_configuration_updated/irma-demo/index.sig b/testdata/irma_configuration_updated/irma-demo/index.sig
index 8de564aac..5bbcc969f 100644
Binary files a/testdata/irma_configuration_updated/irma-demo/index.sig and b/testdata/irma_configuration_updated/irma-demo/index.sig differ
diff --git a/testdata/irma_configuration_updated/irma-demo/timestamp b/testdata/irma_configuration_updated/irma-demo/timestamp
index 6a946c026..768c63cb9 100644
--- a/testdata/irma_configuration_updated/irma-demo/timestamp
+++ b/testdata/irma_configuration_updated/irma-demo/timestamp
@@ -1 +1 @@
-1696329069
+1701185681
diff --git a/testdata/irma_configuration_updated/test-requestors/index b/testdata/irma_configuration_updated/test-requestors/index
index 0febcf253..ec3e60aed 100644
--- a/testdata/irma_configuration_updated/test-requestors/index
+++ b/testdata/irma_configuration_updated/test-requestors/index
@@ -1,3 +1,3 @@
 e870f28cd43899e077be26cb2465a562c594fda8c956cc8cb3d2f6f9a4074806 test-requestors/description.json
 607af0b6bce715135ae8dae85a4ce9cf3a5ffaff2edb4cddbef21f0c0da8271c test-requestors/requestors.json
-c6f3de9c1ef2480cb966cdc07aecb938a63d57bc71268fdfa818d1b00a87e0a2 test-requestors/timestamp
+b0f52d7b060357fdd315b68af38ca0967346697bb4aa4553325ddcd3961b7d3d test-requestors/timestamp
diff --git a/testdata/irma_configuration_updated/test-requestors/index.sig b/testdata/irma_configuration_updated/test-requestors/index.sig
index bb8cca7e1..959bc648e 100644
Binary files a/testdata/irma_configuration_updated/test-requestors/index.sig and b/testdata/irma_configuration_updated/test-requestors/index.sig differ
diff --git a/testdata/irma_configuration_updated/test-requestors/timestamp b/testdata/irma_configuration_updated/test-requestors/timestamp
index 6a946c026..768c63cb9 100644
--- a/testdata/irma_configuration_updated/test-requestors/timestamp
+++ b/testdata/irma_configuration_updated/test-requestors/timestamp
@@ -1 +1 @@
-1696329069
+1701185681