diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json b/tests/repository_data/client/test_repository/metadata/current/1.root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/1.root.json and b/tests/repository_data/client/test_repository/metadata/current/1.root.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz
index c0f73a17..5d5913af 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz and b/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/role1.json b/tests/repository_data/client/test_repository/metadata/current/role1.json
index 45e4a14e..e664618a 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/role1.json and b/tests/repository_data/client/test_repository/metadata/current/role1.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/role1.json.gz b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz
index 07ddf083..4b9ff545 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/role2.json b/tests/repository_data/client/test_repository/metadata/current/role2.json
index 22fbfccc..871be73a 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/role2.json and b/tests/repository_data/client/test_repository/metadata/current/role2.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/role2.json.gz b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz
index fa2c4407..6be24b78 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/root.json b/tests/repository_data/client/test_repository/metadata/current/root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/root.json and b/tests/repository_data/client/test_repository/metadata/current/root.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/root.json.gz b/tests/repository_data/client/test_repository/metadata/current/root.json.gz
deleted file mode 100644
index 2df907ec..00000000
Binary files a/tests/repository_data/client/test_repository/metadata/current/root.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json b/tests/repository_data/client/test_repository/metadata/current/snapshot.json
index db769f80..bd124f50 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/snapshot.json and b/tests/repository_data/client/test_repository/metadata/current/snapshot.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz
index 32e95b7e..b482985b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz and b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/targets.json b/tests/repository_data/client/test_repository/metadata/current/targets.json
index 316679fe..ee0cc598 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/targets.json and b/tests/repository_data/client/test_repository/metadata/current/targets.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/targets.json.gz b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz
index a0af09d0..0f54614b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json b/tests/repository_data/client/test_repository/metadata/current/timestamp.json
index 6262a5c2..5d3a3dbe 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/timestamp.json and b/tests/repository_data/client/test_repository/metadata/current/timestamp.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz
index 5842a0bf..c5ce051f 100644
Binary files a/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz and b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json b/tests/repository_data/client/test_repository/metadata/previous/1.root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/1.root.json and b/tests/repository_data/client/test_repository/metadata/previous/1.root.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz
deleted file mode 100644
index c0f73a17..00000000
Binary files a/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/role1.json b/tests/repository_data/client/test_repository/metadata/previous/role1.json
index 45e4a14e..e664618a 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/role1.json and b/tests/repository_data/client/test_repository/metadata/previous/role1.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz
index 07ddf083..4b9ff545 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/role2.json b/tests/repository_data/client/test_repository/metadata/previous/role2.json
index 22fbfccc..871be73a 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/role2.json and b/tests/repository_data/client/test_repository/metadata/previous/role2.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz
index fa2c4407..6be24b78 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/root.json b/tests/repository_data/client/test_repository/metadata/previous/root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/root.json and b/tests/repository_data/client/test_repository/metadata/previous/root.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json
index db769f80..bd124f50 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json and b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz
index 32e95b7e..b482985b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/targets.json b/tests/repository_data/client/test_repository/metadata/previous/targets.json
index 316679fe..ee0cc598 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/targets.json and b/tests/repository_data/client/test_repository/metadata/previous/targets.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz
index a0af09d0..0f54614b 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json
index 6262a5c2..5d3a3dbe 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json and b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz
index 5842a0bf..c5ce051f 100644
Binary files a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz differ
diff --git a/tests/repository_data/keystore/delegation_key b/tests/repository_data/keystore/delegation_key
index 9656a6fb..461169d6 100644
--- a/tests/repository_data/keystore/delegation_key
+++ b/tests/repository_data/keystore/delegation_key
@@ -1 +1 @@
-f027d1bf6ee9918c9d7af5f5957c5755@@@@100000@@@@7b8556aa892f5ca3fe5473355c1f8f419ae86017d65176e8b818d70d06beda58@@@@512b9499b34212d1c49dc612734858d9@@@@613469c7b1ab4f0643074560d955cb33209981bbb2e26e4dc4da7727a9963e76e623182f9e6f189e7f02d5feb52910b797c1c32fedce5396012870c402ce2dfaed05ab373ca693472672f28ecd39644ccfdb9c44857385a5e67ab447c91ad8efc037f290d92921dc41acf5dd350326f5c58108fc8c64e290c8244dbbd69a93ef32f6dd109f065a9a080b913d6cd2333262a8866509dd2b93181f305be4a633747a4c9a73d19dd83eb198463694a1560f773ebb586e2147790b4ecf6b60db8132537ee206ba7286d2a385f82ea0a620e744e6a24d807c93a0a133bf70c573d6ac1a54ef37db24b243c775e45cf61d6ed1268777b316939ea91379ea370d1ad2ee14cee5188f1f2e121dbac6fd
\ No newline at end of file
+68593a508472ad3007915379e6b1f3c0@@@@100000@@@@615986af4d1ba89aeadc2f489f89b0e8d46da133a6f75c7b162b8f99f63f86ed@@@@8319255f9856c4f40f9d71bc10e79e5d@@@@1dc7b20f1c668a1f544dc39c7a9fcb3c4a4dd34d1cc8c9d8f779bab026cf0b8e0f46e53bc5ed20bf0e5048b94a5d2ea176e79c12bcc7daa65cd55bf810deebeec5bc903ce9e5316d7dbba88f1a2b51d3f9bc782f8fa9b21dff91609ad0260e21a2039223f816d0fe97ace2e204d0025d327b38d27aa6cd87e85aa8883bfcb6d12f93155d72ffd3c7717a0570cf9811eb6d6a340baa0f27433315d83322c685fec02053ff8c173c4ebf91a258e83402f39546821e3352baa7b246e33b2a573a8ff7b289682407abbcb9184249d4304db68d3bf8e124e94377fd62dde5c4f3b7617d483776345154d047d139b1e559351577da315f54e16153c510159e1908231574bcf49c4f96cafe6530e86a09e9eee47bcff78f2fed2984754c895733938999ff085f9e3532d7174fd76dc09921506dd2137e16ec4926998f5d9df8a8ffb3e6649c71bc32571b2e24357739fa1a56be
\ No newline at end of file
diff --git a/tests/repository_data/keystore/delegation_key.pub b/tests/repository_data/keystore/delegation_key.pub
index 1536e820..d600bffb 100644
--- a/tests/repository_data/keystore/delegation_key.pub
+++ b/tests/repository_data/keystore/delegation_key.pub
@@ -1 +1 @@
-{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a"}}
\ No newline at end of file
+{"keyval": {"public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]}
\ No newline at end of file
diff --git a/tests/repository_data/keystore/root_key b/tests/repository_data/keystore/root_key
index c5437692..1b8fb145 100644
--- a/tests/repository_data/keystore/root_key
+++ b/tests/repository_data/keystore/root_key
@@ -1,42 +1,42 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,6015A3049DBF1CD5
-
-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
------END RSA PRIVATE KEY-----
\ No newline at end of file
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+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
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/repository_data/keystore/root_key.pub b/tests/repository_data/keystore/root_key.pub
index a04eb420..11cc245f 100644
--- a/tests/repository_data/keystore/root_key.pub
+++ b/tests/repository_data/keystore/root_key.pub
@@ -1,11 +1,11 @@
 -----BEGIN PUBLIC KEY-----
-MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l
-Vc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx
-Jkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7
-MpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK
-hI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2
-xx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c
-pSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ
-kMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE
-AUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe
+PkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i
+xmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity
+fQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa
+ndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc
+MdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV
+z94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y
+R47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA
+a82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=
 -----END PUBLIC KEY-----
diff --git a/tests/repository_data/keystore/snapshot_key b/tests/repository_data/keystore/snapshot_key
index 9c0f3b35..08c954fd 100644
--- a/tests/repository_data/keystore/snapshot_key
+++ b/tests/repository_data/keystore/snapshot_key
@@ -1 +1 @@
-481eac26df5b6688c775c03de82dffa1@@@@100000@@@@65c88dd37151f6d869cf4ecdd46ccc8269da3eb2d491a8b28622fdc71d324ffb@@@@cb3d36a32d0cd80485b045dc665b1089@@@@c3b3df6223832cb2879dcbab8904c369cfbd525aa27d9e2d60fd2da023c8b63a7a503baaaeb3511c5dcd941c872029df235e950bae85ab987d3e521ab4b2aaa3f12abbfacb81045f0e4584a98e474f9170690c26921ebd72df98cf5a9f656f3ace8e4f9be19019b0c9efc1077fd6e29d2d9b259257b5a2940fb85f90a7638090d3c4bafc98dd8db217137957a8a72a83c9fe751288decd537ad583bcd30154632c98c743988fe4bb47bfcda229445343d20ea8698679b78a1625f9b77cc86d4a2c47272d7ffb20b60ab403dac47fed3a863a74cec128231a70e3c71527e4f0a3761a878f90bbfd40eb31072be9f974284125a5e38ab5728d1dd29b9ee6c6f3133c18043f6ae3d5dfa2d0ec57
\ No newline at end of file
+a87b80b8a0d39b919b9638181e7b274e@@@@100000@@@@132edd670981aaf1980673966266174d944d735eb5b0b7ec83ed97da5c212249@@@@bd08ae9898ac5f81fc14e418e9790f9b@@@@399250c9aad40035e0acff48db59697bc3cf33d55b52aa272246addeaaf318d931d3a72964f0c84eccf5b89279b8233685330ad884f7b39bf369553133b985f9396bd5e24cb8e343643923022565a645e188a1165e427aedc389cca821d6a93cb2d8d16cea8ffeb56469bcb9f2f66e03d581a2ea37da271980dd02b84717fe475e13a305b4ae714c11c94f6711c744bb291a146d7419474584bad4be152d0299273c1fad6cd95232a4bf07f39c16da7f4d13201a88fad822cb328008e8a2762baf974b5d5080451751fb8ef53a01ca734157be78b3eb13c6270e4e98b138c78388360e7f558389871b7a32b4d5572626b3112264a0b56dbbb1138c9765872a71dd4e7d31006c2e690f5ede608ce633ad94ebb7d1ddec1a7eac2168fc5d36efe590c4c2059c6f3bcf75ab63474eede3ce4fdc93c6564058b14a0fa9bf3cb6d58c53315b406409ee4aeb18abe072734df0
\ No newline at end of file
diff --git a/tests/repository_data/keystore/snapshot_key.pub b/tests/repository_data/keystore/snapshot_key.pub
index 9222aacf..d08bb848 100644
--- a/tests/repository_data/keystore/snapshot_key.pub
+++ b/tests/repository_data/keystore/snapshot_key.pub
@@ -1 +1 @@
-{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8"}}
\ No newline at end of file
+{"keyval": {"public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]}
\ No newline at end of file
diff --git a/tests/repository_data/keystore/targets_key b/tests/repository_data/keystore/targets_key
index 3f872f4e..c3883ec3 100644
--- a/tests/repository_data/keystore/targets_key
+++ b/tests/repository_data/keystore/targets_key
@@ -1 +1 @@
-1d4fbaef4715e89f94655857f0bac179@@@@100000@@@@5eab500ba01eab1dc380999f03bf6ef1d6ce8d5534e56278dc3c97cb48f6db0f@@@@2e5a0b1a8e05b61f0d78cb5ed2d2077f@@@@665ef8e0272749664c19df418c937d86c4ee9be94851762e622f6eb80c6694738baa397e597fc6761d2d5c24a1db98014c44d489a7348adea62d0e961234b32aa2ee4d69f400c909dbadf5b76d1e579ae7dd595856757e6da7fa310a218261fdb9efb867962a1ed19109015e7755c23f42ea819773df2779dccab2c1bad2cbfdb05ed4b38da1f58d780f937a47d66058f97ca5d8720a8312b4370ce4e75c8aba5ae864a239cc27645da216df331cee9f9a103d788c64de2e42c8630a9f54ef0ddc87327abc121de9d928147e3f8e12a94a2423cef569affc977677b263eb4c42506002d65edaa0b58cddc9075bb60dd0971bfa604d1e952b67a9fc78455693c134b50c34acb8d139a0fb49d0
\ No newline at end of file
+a5a903322888df0bf8275b215f2044fe@@@@100000@@@@5f6b803652cb6d5bce4e07b1482597adb96d06c2efa3393abdcc0425f70be692@@@@0664811967e2f413927ce51a7f43a80e@@@@cf1dccd034400195c667c064198ef25555f3f94bf9cf77fbe300246618e557ad0efa775ef90bd46c842696c45d14033199860b2214c3641e87889a41171f8a2c763d004681b66b462ff34599e8d9da87f5642d2a015b75d3f601d198e0467fa4bc28f65c76260585e0cce71281f67a8053116f0f06883155f602811071b56bf75bf54daae5968b0a31cf829510f3c52c0eeb8f1c6bb8b8cb0c3edb4c6c2dd9d13bee00c5d63c3f98e0904eebb609864f4ab4fcc2c17bba8fd36aa06bc96bc1922eb10557051a674acf2cb01ff3efb7d55411df6915bbc49a095ff4472dc441e2765244f801d0df07b754c952d039f39b4530930a14be42cb2041f22eeb306b12f12158fcd2beb033db1be21f5a6ab72335cf16dfbd19cbf39c00b0a571d2b0e25df032be53a49a7a70ecebebb441d327c638cf31804381afaf809cd1c75f9070e83240fbaaa87bea0799404ece788862
\ No newline at end of file
diff --git a/tests/repository_data/keystore/targets_key.pub b/tests/repository_data/keystore/targets_key.pub
index 7ac5726a..e859eb22 100644
--- a/tests/repository_data/keystore/targets_key.pub
+++ b/tests/repository_data/keystore/targets_key.pub
@@ -1 +1 @@
-{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2"}}
\ No newline at end of file
+{"keyval": {"public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]}
\ No newline at end of file
diff --git a/tests/repository_data/keystore/timestamp_key b/tests/repository_data/keystore/timestamp_key
index 0e678613..ca825790 100644
--- a/tests/repository_data/keystore/timestamp_key
+++ b/tests/repository_data/keystore/timestamp_key
@@ -1 +1 @@
-371c9b3b39a3c35ca0968d045ce58d1d@@@@100000@@@@975c02c936e651682f3b80f8d782411192ed17eb3e32de148cf13ea679c705d8@@@@ee4467b6250c9f88cdd4952d891e4681@@@@83336db56e4e30f481194e319c6b89de25bf795a57b27f8b060405881c79cdc4cfaa8acf886a4ba017e4bf78e78285b7ba67bf974e38d1e733961c49bc6bad1076c85bed527b468039f7980783caf0dcf32093ad96fe2fd56cf149dd7608bc582b0732a408e63085cdca59e2044ed688e7ae22883eefff48578c42c413d9ad4eed0f22758ce540c87b24365e906ddb1ffb628de5c97717fab73710c0f9425054bc31563ea217ef07e6d01b7e67a8d22ba4f30a0c1969317cca46bccc3c80ad9c085d52260e62d31f13c5a3192a4065529056211a634d5b21ad1386d5ddd9756c24c1c55ed7f63f84367b6072a919312c3e2ccca595aea64746b0f9dbe0ef6548090d17a2ad128bbf7bf1e756
\ No newline at end of file
+677a42cd6c1df08d0c6156ae356c2875@@@@100000@@@@3850dbcf2973b80044912d630f05039df64775b63d1cf43e750d3cd8a457c64f@@@@bf01961c386d9fefb4b29db7f6ef0c7f@@@@96d37abafb902f821134d2034855d23b78c82e5b768b092fcf0d3b6b28a74734877a5014b26e5fed289d24f7cf6b393445c3231554c5b6d9711192cf9bd2fb7490497d7d76c619a0cfc70abae026b5068fb66db0138b04f890917daad66ca1f7baabdcbb5282e46a2f1c6ff2e8c241ff16ef31e918ca1387a15bc2ceadb2f75ce68fcff08186b5b901a499efe1f674319b503ff8b6fc004b71d0ecb94253f38c58349ab749e72f492e541e7504d25a0bfe791f53eb95c4524431b0f952fc3d7c7204a2a4aab44d33fe09cb36b337339e2a004bf15dfd925b63930905972749441a0c6e50ec9b1748a4cfbacf10b402ebd9c0074fcb38d236fd3146f60232862b0501e8e6caa9f81c223de03ba7b25a1d4bc2d031901dc445f25ce302d2189b8b8de443bc6f562f941b55595655193ab6b84c1ec2302ca056c70e8efb1cad909c50e82e0b7da9ad64202d149e4e837409
\ No newline at end of file
diff --git a/tests/repository_data/keystore/timestamp_key.pub b/tests/repository_data/keystore/timestamp_key.pub
index c111a806..69ba7ded 100644
--- a/tests/repository_data/keystore/timestamp_key.pub
+++ b/tests/repository_data/keystore/timestamp_key.pub
@@ -1 +1 @@
-{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c"}}
\ No newline at end of file
+{"keyval": {"public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]}
\ No newline at end of file
diff --git a/tests/repository_data/repository/metadata.staged/1.root.json b/tests/repository_data/repository/metadata.staged/1.root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/repository/metadata.staged/1.root.json and b/tests/repository_data/repository/metadata.staged/1.root.json differ
diff --git a/tests/repository_data/repository/metadata.staged/1.root.json.gz b/tests/repository_data/repository/metadata.staged/1.root.json.gz
index c0f73a17..5d5913af 100644
Binary files a/tests/repository_data/repository/metadata.staged/1.root.json.gz and b/tests/repository_data/repository/metadata.staged/1.root.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/role1.json b/tests/repository_data/repository/metadata.staged/role1.json
index 45e4a14e..e664618a 100644
Binary files a/tests/repository_data/repository/metadata.staged/role1.json and b/tests/repository_data/repository/metadata.staged/role1.json differ
diff --git a/tests/repository_data/repository/metadata.staged/role1.json.gz b/tests/repository_data/repository/metadata.staged/role1.json.gz
index 07ddf083..4b9ff545 100644
Binary files a/tests/repository_data/repository/metadata.staged/role1.json.gz and b/tests/repository_data/repository/metadata.staged/role1.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/role2.json b/tests/repository_data/repository/metadata.staged/role2.json
index 22fbfccc..871be73a 100644
Binary files a/tests/repository_data/repository/metadata.staged/role2.json and b/tests/repository_data/repository/metadata.staged/role2.json differ
diff --git a/tests/repository_data/repository/metadata.staged/role2.json.gz b/tests/repository_data/repository/metadata.staged/role2.json.gz
index fa2c4407..6be24b78 100644
Binary files a/tests/repository_data/repository/metadata.staged/role2.json.gz and b/tests/repository_data/repository/metadata.staged/role2.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/root.json b/tests/repository_data/repository/metadata.staged/root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/repository/metadata.staged/root.json and b/tests/repository_data/repository/metadata.staged/root.json differ
diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json b/tests/repository_data/repository/metadata.staged/snapshot.json
index db769f80..bd124f50 100644
Binary files a/tests/repository_data/repository/metadata.staged/snapshot.json and b/tests/repository_data/repository/metadata.staged/snapshot.json differ
diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json.gz b/tests/repository_data/repository/metadata.staged/snapshot.json.gz
index 32e95b7e..b482985b 100644
Binary files a/tests/repository_data/repository/metadata.staged/snapshot.json.gz and b/tests/repository_data/repository/metadata.staged/snapshot.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/targets.json b/tests/repository_data/repository/metadata.staged/targets.json
index 316679fe..ee0cc598 100644
Binary files a/tests/repository_data/repository/metadata.staged/targets.json and b/tests/repository_data/repository/metadata.staged/targets.json differ
diff --git a/tests/repository_data/repository/metadata.staged/targets.json.gz b/tests/repository_data/repository/metadata.staged/targets.json.gz
index a0af09d0..0f54614b 100644
Binary files a/tests/repository_data/repository/metadata.staged/targets.json.gz and b/tests/repository_data/repository/metadata.staged/targets.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json b/tests/repository_data/repository/metadata.staged/timestamp.json
index 6262a5c2..5d3a3dbe 100644
Binary files a/tests/repository_data/repository/metadata.staged/timestamp.json and b/tests/repository_data/repository/metadata.staged/timestamp.json differ
diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json.gz b/tests/repository_data/repository/metadata.staged/timestamp.json.gz
index 5842a0bf..c5ce051f 100644
Binary files a/tests/repository_data/repository/metadata.staged/timestamp.json.gz and b/tests/repository_data/repository/metadata.staged/timestamp.json.gz differ
diff --git a/tests/repository_data/repository/metadata/1.root.json b/tests/repository_data/repository/metadata/1.root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/repository/metadata/1.root.json and b/tests/repository_data/repository/metadata/1.root.json differ
diff --git a/tests/repository_data/repository/metadata/1.root.json.gz b/tests/repository_data/repository/metadata/1.root.json.gz
index c0f73a17..5d5913af 100644
Binary files a/tests/repository_data/repository/metadata/1.root.json.gz and b/tests/repository_data/repository/metadata/1.root.json.gz differ
diff --git a/tests/repository_data/repository/metadata/role1.json b/tests/repository_data/repository/metadata/role1.json
index 45e4a14e..e664618a 100644
Binary files a/tests/repository_data/repository/metadata/role1.json and b/tests/repository_data/repository/metadata/role1.json differ
diff --git a/tests/repository_data/repository/metadata/role1.json.gz b/tests/repository_data/repository/metadata/role1.json.gz
index 07ddf083..4b9ff545 100644
Binary files a/tests/repository_data/repository/metadata/role1.json.gz and b/tests/repository_data/repository/metadata/role1.json.gz differ
diff --git a/tests/repository_data/repository/metadata/role2.json b/tests/repository_data/repository/metadata/role2.json
index 22fbfccc..871be73a 100644
Binary files a/tests/repository_data/repository/metadata/role2.json and b/tests/repository_data/repository/metadata/role2.json differ
diff --git a/tests/repository_data/repository/metadata/role2.json.gz b/tests/repository_data/repository/metadata/role2.json.gz
index fa2c4407..6be24b78 100644
Binary files a/tests/repository_data/repository/metadata/role2.json.gz and b/tests/repository_data/repository/metadata/role2.json.gz differ
diff --git a/tests/repository_data/repository/metadata/root.json b/tests/repository_data/repository/metadata/root.json
index f74a7171..f6998b4b 100644
Binary files a/tests/repository_data/repository/metadata/root.json and b/tests/repository_data/repository/metadata/root.json differ
diff --git a/tests/repository_data/repository/metadata/snapshot.json b/tests/repository_data/repository/metadata/snapshot.json
index db769f80..bd124f50 100644
Binary files a/tests/repository_data/repository/metadata/snapshot.json and b/tests/repository_data/repository/metadata/snapshot.json differ
diff --git a/tests/repository_data/repository/metadata/snapshot.json.gz b/tests/repository_data/repository/metadata/snapshot.json.gz
index 32e95b7e..b482985b 100644
Binary files a/tests/repository_data/repository/metadata/snapshot.json.gz and b/tests/repository_data/repository/metadata/snapshot.json.gz differ
diff --git a/tests/repository_data/repository/metadata/targets.json b/tests/repository_data/repository/metadata/targets.json
index 316679fe..ee0cc598 100644
Binary files a/tests/repository_data/repository/metadata/targets.json and b/tests/repository_data/repository/metadata/targets.json differ
diff --git a/tests/repository_data/repository/metadata/targets.json.gz b/tests/repository_data/repository/metadata/targets.json.gz
index a0af09d0..0f54614b 100644
Binary files a/tests/repository_data/repository/metadata/targets.json.gz and b/tests/repository_data/repository/metadata/targets.json.gz differ
diff --git a/tests/repository_data/repository/metadata/timestamp.json b/tests/repository_data/repository/metadata/timestamp.json
index 6262a5c2..5d3a3dbe 100644
Binary files a/tests/repository_data/repository/metadata/timestamp.json and b/tests/repository_data/repository/metadata/timestamp.json differ
diff --git a/tests/repository_data/repository/metadata/timestamp.json.gz b/tests/repository_data/repository/metadata/timestamp.json.gz
index 5842a0bf..c5ce051f 100644
Binary files a/tests/repository_data/repository/metadata/timestamp.json.gz and b/tests/repository_data/repository/metadata/timestamp.json.gz differ