diff --git a/tests/repository_data/client/metadata/current/root.json b/tests/repository_data/client/metadata/current/root.json
index 37993bf1..9174375e 100644
Binary files a/tests/repository_data/client/metadata/current/root.json and b/tests/repository_data/client/metadata/current/root.json differ
diff --git a/tests/repository_data/client/metadata/current/snapshot.json b/tests/repository_data/client/metadata/current/snapshot.json
index 9a960dcd..b4ad9096 100644
Binary files a/tests/repository_data/client/metadata/current/snapshot.json and b/tests/repository_data/client/metadata/current/snapshot.json differ
diff --git a/tests/repository_data/client/metadata/current/targets.json b/tests/repository_data/client/metadata/current/targets.json
index 0a7b4a8b..e9da47bb 100644
Binary files a/tests/repository_data/client/metadata/current/targets.json and b/tests/repository_data/client/metadata/current/targets.json differ
diff --git a/tests/repository_data/client/metadata/current/targets.json.gz b/tests/repository_data/client/metadata/current/targets.json.gz
deleted file mode 100644
index 757cff50..00000000
Binary files a/tests/repository_data/client/metadata/current/targets.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/current/targets/role1.json b/tests/repository_data/client/metadata/current/targets/role1.json
index d4d3c560..c5e3bc86 100644
Binary files a/tests/repository_data/client/metadata/current/targets/role1.json and b/tests/repository_data/client/metadata/current/targets/role1.json differ
diff --git a/tests/repository_data/client/metadata/current/timestamp.json b/tests/repository_data/client/metadata/current/timestamp.json
index 55099610..e94a2a89 100644
Binary files a/tests/repository_data/client/metadata/current/timestamp.json and b/tests/repository_data/client/metadata/current/timestamp.json differ
diff --git a/tests/repository_data/client/metadata/previous/root.json b/tests/repository_data/client/metadata/previous/root.json
index 37993bf1..9174375e 100644
Binary files a/tests/repository_data/client/metadata/previous/root.json and b/tests/repository_data/client/metadata/previous/root.json differ
diff --git a/tests/repository_data/client/metadata/previous/snapshot.json b/tests/repository_data/client/metadata/previous/snapshot.json
index 9a960dcd..b4ad9096 100644
Binary files a/tests/repository_data/client/metadata/previous/snapshot.json and b/tests/repository_data/client/metadata/previous/snapshot.json differ
diff --git a/tests/repository_data/client/metadata/previous/targets.json b/tests/repository_data/client/metadata/previous/targets.json
index 0a7b4a8b..e9da47bb 100644
Binary files a/tests/repository_data/client/metadata/previous/targets.json and b/tests/repository_data/client/metadata/previous/targets.json differ
diff --git a/tests/repository_data/client/metadata/previous/targets.json.gz b/tests/repository_data/client/metadata/previous/targets.json.gz
index 757cff50..e2d2dbe0 100644
Binary files a/tests/repository_data/client/metadata/previous/targets.json.gz and b/tests/repository_data/client/metadata/previous/targets.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/targets/role1.json b/tests/repository_data/client/metadata/previous/targets/role1.json
index d4d3c560..c5e3bc86 100644
Binary files a/tests/repository_data/client/metadata/previous/targets/role1.json and b/tests/repository_data/client/metadata/previous/targets/role1.json differ
diff --git a/tests/repository_data/client/metadata/previous/timestamp.json b/tests/repository_data/client/metadata/previous/timestamp.json
index 55099610..e94a2a89 100644
Binary files a/tests/repository_data/client/metadata/previous/timestamp.json and b/tests/repository_data/client/metadata/previous/timestamp.json differ
diff --git a/tests/repository_data/generate.py b/tests/repository_data/generate.py
index 2bc1c67c..15e5a661 100755
--- a/tests/repository_data/generate.py
+++ b/tests/repository_data/generate.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 """
 <Program Name>
   generate.py
@@ -86,13 +88,13 @@
 target3_filepath = 'repository/targets/file3.txt'
 tuf.util.ensure_parent_dir(target2_filepath)
 
-with open(target1_filepath, 'wb') as file_object:
+with open(target1_filepath, 'wt') as file_object:
   file_object.write('This is an example target file.')
 
-with open(target2_filepath, 'wb') as file_object:
+with open(target2_filepath, 'wt') as file_object:
   file_object.write('This is an another example target file.')
 
-with open(target3_filepath, 'wb') as file_object:
+with open(target3_filepath, 'wt') as file_object:
   file_object.write('This is role1\'s target file.')
 
 # Add target files to the top-level 'targets.json' role.  These target files
@@ -106,11 +108,11 @@
 # Set the top-level expiration times far into the future so that
 # they do not expire anytime soon, or else the tests fail.  Unit tests may
 # modify the expiration  datetimes (of the copied files), if they wish.
-repository.root.expiration = datetime.datetime(2030, 01, 01, 00, 00)
-repository.targets.expiration = datetime.datetime(2030, 01, 01, 00, 00)
-repository.snapshot.expiration = datetime.datetime(2030, 01, 01, 00, 00)
-repository.timestamp.expiration = datetime.datetime(2030, 01, 01, 00, 00)
-repository.targets('role1').expiration = datetime.datetime(2030, 01, 01, 00, 00)
+repository.root.expiration = datetime.datetime(2030, 1, 1, 0, 0)
+repository.targets.expiration = datetime.datetime(2030, 1, 1, 0, 0)
+repository.snapshot.expiration = datetime.datetime(2030, 1, 1, 0, 0)
+repository.timestamp.expiration = datetime.datetime(2030, 1, 1, 0, 0)
+repository.targets('role1').expiration = datetime.datetime(2030, 1, 1, 0, 0)
 
 # Compress the 'targets.json' role so that the unit tests have a pre-generated
 # example of compressed metadata.
diff --git a/tests/repository_data/keystore/delegation_key b/tests/repository_data/keystore/delegation_key
index fbdd0d1e..8e7d0989 100644
--- a/tests/repository_data/keystore/delegation_key
+++ b/tests/repository_data/keystore/delegation_key
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,31815D9E16C988F5
+DEK-Info: DES-EDE3-CBC,15C68797C3B9B4DE
 
-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
+olZelOMTOmshXz5WmIg394qt0MLJKKYGCjg/qwtedvw5JVFY+SekVWxAVPGAy1cn
+NbIf5HS/FDaOsey2yrnBOUy09SPUIEIb7hYFsTWkOh/H0eYLQlU8z3WG1z5SJf3U
+1gfVGGgiNJ1mneq6EtJUS6MJxIG1vdzAoUOVnW2tiIrnT+PcLFCSL79VRQfscy6k
+H0pnxOvo/18C1JpFpQOdNo8gJZr0M6mzrpkKxG4ZWKVqX2CnPk6nTOfq/pVxelU3
+AMhYjlu53aFs4CnjidGxwzKAht5oRMGC8KmDEin5LHhalkQ/NnZNq0QIJh8m+cWL
+RxtgbzU0zY7iUvQhjcgnSlXpSvW0zrVXxW8gHarCSnsH7dLW4v50m4ATktrkytYS
+A2I1t7DwhAyp5pklSZnRhaWcjwHiQswbZeVMrX3tkWqqOqSpfFGEHl9pqAnr+GZ0
+FRELOxIts4p6yF4iI4B8Gw8Qw5xz4RjHpcbYj1yharKik/D2AiaA/sI/lKOL/i0S
+CQ75aUdLhuczpBQlxqOjz/N13Sd7ZtdsBN/lMrjEkYQeE8gkziEh3Q9x3Pd932Ui
+nQSZ+bKcItuWvMomDSAtOVcnCKxx8tCQa9YuKUSJCTOspflIQbBa6RexLOgqFbby
+FBuxgH5lwI67GpHnhxTxkubUqe39auT+H/iFHaHjIF5S2/19pds3EV/PXBsKjVqv
+FMzQhV6c8IzVLpeLkg+yB8U1onO3NpeK87AHBAYkA4cHuxNq9hLt2hYAgtHJE1Fs
+2fo5FWka5eUPbUhu8tZkbsKg+gukLb41oTlQ2dxndki+61C7prYkeC1FtmU4vQmb
+ZPK25AHQi1zvKsd09vxiKWaeMcHIlkeCFaCQC7Bz4uv4bM9K1ewPRr25gY5iwz+O
+z+7a1zFRcJNQd/WhamVXjBpXMhlSVmkOWA2WTsHyf3OBLERZixkokHPdDxxyYEb1
+45RPBdPC2Mct+dmrOpTO/a1xotpV2ZPzIrE8+ffVRiy2ho3fXJUHe3OK0ko+gKYQ
+bknSqcfRlViXjBwRioo7vxsr60oFa7+ALXoktlTxbvy6FbybOKBhjezkpLzepJyj
+GjI9QyqBZqTdevSaBMQzD190DyziHUIAUpOsgn01GVhdvW9+FziCPs+rtlARALJR
+OycFZvRvo5f1CXIVJTu6VAl1jQ/A19DBLqqVM+oH700ymlqN8gw5/o6JXPGS6u6v
+vn2OndWTBPCsI8JFkmDvFkyFOOJqc4fD2JKBUl+/oygvH6PIPOibNFKuuVq4hJIA
+cpaXW7+EVI9nzCa70O5hxw01MFcfKPEhqPEcNiOjU1kXGmRSEap84lttg67MQ0xg
+0EpwFlaAB/xrKL628jsFupwB1I/fGP+ANZRHxFMIl1MGSq1EATw2jsxIOUdQ3bE5
+LlR6BWO0Co4uCmEjNIhfHHysKL8NZ1btYgE0TI/k2YxKklh/c/DRC+TskiW1KRWP
+BOpNwDPWyBTxYSpXGB0HAAbcGLqKZz07EGHJUdySJBm8ReP/UUOo/fjynT80gC//
+ptaOUGgaCIykjLJl3qGJO61peKXDisaoPjPzTYF/TauFoKftOTRGeQ==
 -----END RSA PRIVATE KEY-----
\ 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 780c740d..34aaa679 100644
--- a/tests/repository_data/keystore/delegation_key.pub
+++ b/tests/repository_data/keystore/delegation_key.pub
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsD++h8KXKhrJpzYxvZTE
-7GqTDKM3uAWL8qGcQnvh7CNbqR4WmZrCQj1zF9hO5OAV+lGVD+JxUXW+yOPw+RjN
-i7mPVa12Mq+vCS7WuosoCoooLpnYhRRVYMgpnhbvnjS6xA+7myJ1Bob+7WUEZZlC
-oWdsmjfYG82sA7TOTubPk0s9pqQllINMEsB4JTTt3P3DD9+uifCFhoAEKeAItcgA
-p4PJw2ImNwJiuet5wTP1ssTclPPWB6ofkm8zXoJUywTIW+hcQhN88jQv4Egx1llj
-pWZbEdkIpNxjm6BAEqfPfiuAt6MA8cmdRpDl+Jn030A1kI7NJossuvTcfHwvReZO
-WwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlVZN8n2Q/WjqVEriSBNt
+M4Jb01zJanuIHBFMSR4+D2bFSxNj3DoIzfVzRPCxJVLQJJ2Yg+4nmEkaIYnodpOE
+7PzWyDEacWhdMSE9nbiYl9QzPEXY25ql9ni6CvEfBIUV74i+bTAT6zfoOpZYfS2M
+ol0VMP+JTHMeqHD8JggQuPMrA50l8clwdwdjKrupqOu/lpxgdPKHASne7rrJBeMz
+WJKr69vZXawbwYyy6bYweMV3/fpEW4UXY6uJSvE8y/Ocf7pBIcVuwFUeooOEjtZT
+GY0C4StOYxeowHhYBTDXMi9XosgTXf5ahyeVd7S6Wq+q8njscih1AXGS99IFhEa5
+YQIDAQAB
 -----END PUBLIC KEY-----
\ No newline at end of file
diff --git a/tests/repository_data/keystore/root_key b/tests/repository_data/keystore/root_key
index 7445b409..b2466db2 100644
--- a/tests/repository_data/keystore/root_key
+++ b/tests/repository_data/keystore/root_key
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,820FC61841CA82E2
+DEK-Info: DES-EDE3-CBC,D79DFCB8B13A2CC2
 
-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
+4MUvnAIdExgehw6B2QUr8GgkOEHoqD1edWGFPWmtFEmDGkUIDyQgu8BSRdrdCe7N
+d17fesyGxivsZnryTOz2b1oFN6U3ixjE3bq9iAPhg6L69EpFq4cD2LaxUxcs3XLa
+EsY8grp50lED/Mx/cUy1PcNXtsu5vY62VTgWapiGNJbOfD2amgdTJX27FX0sPAiX
+qqvbgUiTVKeYh1JYDGUP9CNp+QfjtsuCTY6NQrO7YhJ4BNn9IFZKZ9oDU8tO4U/9
+oW/WRX/7GLD5gw+I45I4SIEsHXaydFtTfAzUsXXs58N9i08t9boUgPtsD6zWdwBS
+M2MkonpXMpQWLaabgq3YjLliaHxM/UrUufEE0SrPaTvDlPBWVgw+qlcU5LyzOmsz
+XEsSUivGF0tdgOsdMyKfS3NJN9+4a7EPJy/aNphyYQgYtEHzpEup4IsETWx7PlYK
+yc4GkSp/ScDqTdYfxOwb3eapbjEAq1znObuUI1FF8Bjr25xuXLFIEfa3MesKM0hV
+xhVTieq7amXWro65u3aiMV8cnKCb+fDvvrMvb1ZWy8nVjzrG2KpGymd7vharMPAC
+5x3Z8Y6xb3aAVmgCFzNXKD+DtVL8gi7h1WrdDraNw9Kj5x+2pjA+i64PWijxiHqs
+TpYdzIlT+1sLdsb7IPK4IDqerOx2AYSp8Y9/hm2iF/4P2RVDD/C5CyRTvV73mDZE
+yzKlT9MLksfBX2w1YSLZjAFEPEobteeAkCranyLL420aP14eVFxkzCeXSPtR5KPT
+zgWTflQLpm53XIUqu66tKpYA4iH89wBKunxfv9YMBjbJesLEf+n6617FXR0bFJhl
+PMXLm3WtGFlCkKe5n1bZcYVkM3B4AVc1uCNsL+2cyTYC+mqVORBU/1eWycwXbX3p
+ZQPg2c+mXWWcp1PTmf7ET0s+jglO326HikEcvoceht2TBI2p+JolPbkgGPrCIqbt
+VCLEyVBzKB5AUaAFYV+jyfV1zO+24GfxU4o3ZvkSCvKJPVgz/dVD2v7asW2MVoTq
+a1De2cmnOo9MXshyb0NtBp5oX5/0GCdO/eIdQ8LkiFJ1omzpQSVHO3ubwwopeSw6
+aJ6QG+SJByYMMK8ZEqwxRs5s909X2KPxSts0aWOKzMd5/SbynQxYXUc+HMS5IypJ
+t2YnCreKaI7VSkusq4owz8YwRL15pkw1+rQDNDlUz8L5pdDyy2d6kLUZl26TU2UR
+l2YKZcb/2rFDj1l7PPtODnKiD7Wa6GBmgse/l58w6B8Db4PYuqPRsLjkz2aP6KRR
+9iRXbcNhlX5J3MBWjHuTy9bjk3NANWvyPtb+SGYqZw2JUMn6R9Fls0Mq8duaFHRy
+ucd6P8KP81XwRni8ApqntDGbikdKuoeR/rSzi7zxXCwAsKF/3j9//dl0/ZLL85KK
+8ShKuFJufmspEuDzyrieNcTVl8YWHO1C4pw2qLgtIatk0LKZfdosnG5uSFsw0Js0
+aqrrTR1CWWAMvmjCAH0/4ZV4gzSwDGJg0BT1SIceebuzC/qK+jJ8nzVMEnfeg7YB
+cH0BAnujjFcqFw7gZlTIeKKOYhGts/pK1OMAekfYzPXBG1PDqc4JTg==
 -----END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/tests/repository_data/keystore/root_key.pub b/tests/repository_data/keystore/root_key.pub
index 9fdf180e..d8fbf21b 100644
--- a/tests/repository_data/keystore/root_key.pub
+++ b/tests/repository_data/keystore/root_key.pub
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72PwhMhTpDZ/wuB5Bdst
-gYsfEI931GcIZ46Iq2dqMNWEg2Qt9w6W0xEQj8M5R99XFwbhXL6U7hKGDt958FzT
-OL6CnjrnnBgzjbFm1vT380Qi5DaUbJkPcNmjzV45gGZkJ6LnohnBtnWUM/IdbbwR
-PdWaqBxWRJHECPHjgbKt6Y9kDwaO6tJQdUIDGwt2V9hz9orPqwiX+c6uO6qJ0naU
-F31ZvI4AtHUDaesbyp2j2X2dfCKNiM2t2sgxz79/G6VQvKG30PXxVPXvOhCDowsk
-5NdM67bWIkFyf1yNArrhw0D/c0aSGZhYZs+FqvBzKjCy+9+uEfLZsRra6zvx8Jw9
-TwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwLbRMxjtj63qRwGAW8oe
+6Bbw0shvSolq3s30yOHjToxTqpeRkHhCyZCextQjN3ishIpVcJM60xQGfFvNNBLj
+Y6aFnavs2K/PPoKB3snO5w2tl0tBic2Kr23zGgbMzT8oqWZHCfdiyZzPa3oaH4fN
+DJqaCvs72cIP8IrpaBsuYbIdtGDU8pXM1dfE2NVA/P+1uxjV3Y2k4Wtf04drYhyR
+mXfy9I6t5a2M5bagVLtF9UM/vM7QExSvCyuvD3D1EMSiaFjxMnsf5uFUo68wPfZB
+bJntUxzELcXcy+O+ks/TOinPwW1KpGff/R2tBD8GxKbwYbNA3eMqxqrHcTY9rWdy
+dwIDAQAB
 -----END PUBLIC KEY-----
\ No newline at end of file
diff --git a/tests/repository_data/keystore/snapshot_key b/tests/repository_data/keystore/snapshot_key
index 5fe431e4..59e1b01a 100644
--- a/tests/repository_data/keystore/snapshot_key
+++ b/tests/repository_data/keystore/snapshot_key
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,0E7D0C9F6987D107
+DEK-Info: DES-EDE3-CBC,05DC466E69140631
 
-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
+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
 -----END RSA PRIVATE KEY-----
\ 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 f892e210..70536aa9 100644
--- a/tests/repository_data/keystore/snapshot_key.pub
+++ b/tests/repository_data/keystore/snapshot_key.pub
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0uAxc1XwUIayVPNt9U/
-gLM5hjG/6AJ86XiHVIq6BuzUtiuKONZXq3SJwY5eAxdjylNt/A3FrJwylQbVMZkh
-wLj0eU1IMh23xV1wOGu63Q9ARkmBAaksM+6apo2CHjtQaNXorhJ3/WDti2hST/cc
-HjP81+JwJ+T6lXGKvGDbh3h6Car99MWlMAeYODdNqvRaVkkiQ20HgNB+RSiyGZPi
-bzqlMe+qCQU/vktmmy9Zw3bjY7b8GFBix+7PHzFCpX15xKwB4dITPmsiL2OOo/w/
-1Vqu3wP7Ct170oK+bH9eIk6wSAQX3IljKhgzkiYFRyCC33XHRpWmSjMgAGErCcl6
-cwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtdmy18GajKzifjlXS9BV
+XasPpZiAJVQmBJHSnRGsLiUs5uqByRC4SdW8OWwpoTB/LXRhicarE6DVv3yK0mJf
+fbjdbRSZC5fYyKCO67oTijttptwzDiLoxVWeCry/5fM0yQ53nPKIkneS27DDraU9
+S0Am9Nmck591QsCCmt4I0u84vQLyhM9HUCrEZyEQVSURdWxj935Sv41/IcXIoH+u
+XOVOmvCc0e+88pg4R70CJaWWsrE8lW8NsCHmYZ8fU4rRhUktDnHx7B5T60Xik/kv
+JMfy0ZtGPJu1VVdnBlCNAooXeiFVo/dBl0TOHp8F6jnautGKILtSnGHUdTzTJDch
+WwIDAQAB
 -----END PUBLIC KEY-----
\ No newline at end of file
diff --git a/tests/repository_data/keystore/targets_key b/tests/repository_data/keystore/targets_key
index 107f8ffa..e3f174be 100644
--- a/tests/repository_data/keystore/targets_key
+++ b/tests/repository_data/keystore/targets_key
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,D32B3B70C5CB2933
+DEK-Info: DES-EDE3-CBC,2CF02CD52C030591
 
-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
+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
 -----END RSA PRIVATE KEY-----
\ 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 a7bd1580..2bc18503 100644
--- a/tests/repository_data/keystore/targets_key.pub
+++ b/tests/repository_data/keystore/targets_key.pub
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqTXKgkuaAyfvjkInfVic
-lJnwLvG9mCXOcxR3HPwHK/8k/E/DBx8YGIGk7NWCXQFYnAeMZZdx8v3dBmH7oGAn
-1pW+LnaAI7Csark8sbgmwYqwTd2oLHHmp/fOZ1vNDWjqvMLwi1YUllR6wPWKAvP2
-8i7q7GCT/MBHDyZ899FCR4f7HvlCW5EYNt+wjxdm79T++Ix7iqvs4iUhvllsfdty
-cVPWc+wh60qqCCbnr1Fow8d2j42a8mHoIHWgDvEF9ch+ChDOzQ+53jVmXS3CC+a2
-H6EWNvKMc/wXvIAwA/y6cIjCG+Kep9AvVgz1blHf4ReTlNJWu2OkanszuboAR6nt
-+wIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxFotGGnsRlu+qXalb2tQ
+FsnNtsI/lDv79sR2tajNGl6X12h+q3asHH248arBbebfoi59tJmDLMl3EJzLETIw
+TFgKxzrKmcCZrlEZPWXCCXyUXd5bWN4KvRDVBNJ40xk3WvPGVj1do6CGKH+W+Iqn
+MRXP3yVxSh9Na2X2T9JxKV9ZYqeiaxFppZYqNS+CxUcm4+o/PmtfJ8YagRhbWIKq
+Q2R1mpsB95Iwl3ZfSYhW021+lwngUzq4RutQSqo4xH2vakpD3BX4bC5eg7IYvjm/
+Gv+bvNGvHQWmOsBSzK69P9WleEkXJLkbTVJ0JB7C1Y9uANWuXeyvTw9+V5QiteYK
+XwIDAQAB
 -----END PUBLIC KEY-----
\ No newline at end of file
diff --git a/tests/repository_data/keystore/timestamp_key b/tests/repository_data/keystore/timestamp_key
index eb8c5bc5..8b56b09e 100644
--- a/tests/repository_data/keystore/timestamp_key
+++ b/tests/repository_data/keystore/timestamp_key
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,D5B52C0993E278D0
+DEK-Info: DES-EDE3-CBC,3495EC0D0BEC51FC
 
-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
+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
 -----END RSA PRIVATE KEY-----
\ 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 ee92796c..09a27dfb 100644
--- a/tests/repository_data/keystore/timestamp_key.pub
+++ b/tests/repository_data/keystore/timestamp_key.pub
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAueyWz2lDPzyywmWegFTP
-l0DDXVNr9XIYLNffLRC24Y9ZKJCqb6eIz3XlF/3On5dCCqKFOfneHm55SxyCzoQb
-RAtr5+SmoXfsds7ZAnxv48iGLtk7aZEvHchhEJ+1HsKy5hMeqpXtOAMPJXqBfqgT
-ZzXagdCHNnbLEvhyJmRAaK88I/93s57KRNvPp6NIUbQ8EHaX1jaWt+LhGfsA3C34
-qcxlk16LXF45Wm2AgMFCtZ2BecUvSQds24b/ShxfeVRtXSSUMDd+dM+MbwclPsoP
-eTeegQATmA4pu4dDaBeYUnS/hstUZS5QPUuvVw6K0Q2JHUWv6CS2kziUjPXGI44H
-LwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAymH18micE+ImSDCQoQh3
+cbTHv0jn1aTKq61R2HYrGFZv9Rrr65xnRLUYP6Ypa6RByQRUwwq4t4v/SUbR74ID
++L8oHdZ3LPrfNx3eJXtGinyvQcayt4C5QwqjmxgT8D7L9G+TODGh42cNbWlguQi/
+fDr+tSC0+ZERXwpYDkyHVJmO0UbEXbWTz7w/R1AAHcbqI71nZtGzZDQlVg6oL7Mz
+F64XJnQn8tB2EQF3Tpo9dLaKkzWJAW3i8bba0ltIBkoAJtDR9MNPyXAsak7QyRkI
+zyjZfDHOXy3iNRHWaLWzw+4pY0WmzyMN5ABBnY61TI8pgLqTmNLSxJY6LmXzIixd
+DQIDAQAB
 -----END PUBLIC KEY-----
\ No newline at end of file
diff --git a/tests/repository_data/repository/metadata.staged/root.json b/tests/repository_data/repository/metadata.staged/root.json
index 37993bf1..9174375e 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 9a960dcd..b4ad9096 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/targets.json b/tests/repository_data/repository/metadata.staged/targets.json
index 0a7b4a8b..e9da47bb 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 757cff50..e2d2dbe0 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/targets/role1.json b/tests/repository_data/repository/metadata.staged/targets/role1.json
index d4d3c560..c5e3bc86 100644
Binary files a/tests/repository_data/repository/metadata.staged/targets/role1.json and b/tests/repository_data/repository/metadata.staged/targets/role1.json differ
diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json b/tests/repository_data/repository/metadata.staged/timestamp.json
index 55099610..e94a2a89 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/root.json b/tests/repository_data/repository/metadata/root.json
index 37993bf1..9174375e 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 9a960dcd..b4ad9096 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/targets.json b/tests/repository_data/repository/metadata/targets.json
index 0a7b4a8b..e9da47bb 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 757cff50..e2d2dbe0 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/targets/role1.json b/tests/repository_data/repository/metadata/targets/role1.json
index d4d3c560..c5e3bc86 100644
Binary files a/tests/repository_data/repository/metadata/targets/role1.json and b/tests/repository_data/repository/metadata/targets/role1.json differ
diff --git a/tests/repository_data/repository/metadata/timestamp.json b/tests/repository_data/repository/metadata/timestamp.json
index 55099610..e94a2a89 100644
Binary files a/tests/repository_data/repository/metadata/timestamp.json and b/tests/repository_data/repository/metadata/timestamp.json differ