diff --git a/tests/repository_data/client/metadata/current/1.root.json b/tests/repository_data/client/metadata/current/1.root.json
deleted file mode 100644
index 12a773da..00000000
Binary files a/tests/repository_data/client/metadata/current/1.root.json and /dev/null differ
diff --git a/tests/repository_data/client/metadata/current/1.root.json.gz b/tests/repository_data/client/metadata/current/1.root.json.gz
deleted file mode 100644
index 4a13f7ef..00000000
Binary files a/tests/repository_data/client/metadata/current/1.root.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/current/role1.json b/tests/repository_data/client/metadata/current/role1.json
index 45e4a14e..96d921b5 100644
Binary files a/tests/repository_data/client/metadata/current/role1.json and b/tests/repository_data/client/metadata/current/role1.json differ
diff --git a/tests/repository_data/client/metadata/current/role1.json.gz b/tests/repository_data/client/metadata/current/role1.json.gz
index 5f13c8b3..e2fd36f0 100644
Binary files a/tests/repository_data/client/metadata/current/role1.json.gz and b/tests/repository_data/client/metadata/current/role1.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/role2.json b/tests/repository_data/client/metadata/current/role2.json
index 22fbfccc..20b1206a 100644
Binary files a/tests/repository_data/client/metadata/current/role2.json and b/tests/repository_data/client/metadata/current/role2.json differ
diff --git a/tests/repository_data/client/metadata/current/role2.json.gz b/tests/repository_data/client/metadata/current/role2.json.gz
index ca3a2767..6074f9bd 100644
Binary files a/tests/repository_data/client/metadata/current/role2.json.gz and b/tests/repository_data/client/metadata/current/role2.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/root.json b/tests/repository_data/client/metadata/current/root.json
index 12a773da..ab8e8dc8 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/root.json.gz b/tests/repository_data/client/metadata/current/root.json.gz
index 8f4301f6..b4c12d14 100644
Binary files a/tests/repository_data/client/metadata/current/root.json.gz and b/tests/repository_data/client/metadata/current/root.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/snapshot.json b/tests/repository_data/client/metadata/current/snapshot.json
index 619b05f7..bf565452 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/snapshot.json.gz b/tests/repository_data/client/metadata/current/snapshot.json.gz
index ff314050..88aa0f12 100644
Binary files a/tests/repository_data/client/metadata/current/snapshot.json.gz and b/tests/repository_data/client/metadata/current/snapshot.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/targets.json b/tests/repository_data/client/metadata/current/targets.json
index 867a42a7..0620bfe4 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
index 723176bb..0753ea69 100644
Binary files a/tests/repository_data/client/metadata/current/targets.json.gz and b/tests/repository_data/client/metadata/current/targets.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/timestamp.json b/tests/repository_data/client/metadata/current/timestamp.json
index 2a9e3bf9..3f44ae97 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/current/timestamp.json.gz b/tests/repository_data/client/metadata/current/timestamp.json.gz
index c07387c8..f5947694 100644
Binary files a/tests/repository_data/client/metadata/current/timestamp.json.gz and b/tests/repository_data/client/metadata/current/timestamp.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/1.root.json b/tests/repository_data/client/metadata/previous/1.root.json
deleted file mode 100644
index 12a773da..00000000
Binary files a/tests/repository_data/client/metadata/previous/1.root.json and /dev/null differ
diff --git a/tests/repository_data/client/metadata/previous/1.root.json.gz b/tests/repository_data/client/metadata/previous/1.root.json.gz
deleted file mode 100644
index 4a13f7ef..00000000
Binary files a/tests/repository_data/client/metadata/previous/1.root.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/previous/role1.json b/tests/repository_data/client/metadata/previous/role1.json
index 45e4a14e..96d921b5 100644
Binary files a/tests/repository_data/client/metadata/previous/role1.json and b/tests/repository_data/client/metadata/previous/role1.json differ
diff --git a/tests/repository_data/client/metadata/previous/role1.json.gz b/tests/repository_data/client/metadata/previous/role1.json.gz
index 5f13c8b3..e2fd36f0 100644
Binary files a/tests/repository_data/client/metadata/previous/role1.json.gz and b/tests/repository_data/client/metadata/previous/role1.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/role2.json b/tests/repository_data/client/metadata/previous/role2.json
index 22fbfccc..20b1206a 100644
Binary files a/tests/repository_data/client/metadata/previous/role2.json and b/tests/repository_data/client/metadata/previous/role2.json differ
diff --git a/tests/repository_data/client/metadata/previous/role2.json.gz b/tests/repository_data/client/metadata/previous/role2.json.gz
index ca3a2767..6074f9bd 100644
Binary files a/tests/repository_data/client/metadata/previous/role2.json.gz and b/tests/repository_data/client/metadata/previous/role2.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/root.json b/tests/repository_data/client/metadata/previous/root.json
index 12a773da..ab8e8dc8 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/root.json.gz b/tests/repository_data/client/metadata/previous/root.json.gz
index 8f4301f6..b4c12d14 100644
Binary files a/tests/repository_data/client/metadata/previous/root.json.gz and b/tests/repository_data/client/metadata/previous/root.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/snapshot.json b/tests/repository_data/client/metadata/previous/snapshot.json
index 619b05f7..bf565452 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/snapshot.json.gz b/tests/repository_data/client/metadata/previous/snapshot.json.gz
index ff314050..88aa0f12 100644
Binary files a/tests/repository_data/client/metadata/previous/snapshot.json.gz and b/tests/repository_data/client/metadata/previous/snapshot.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/targets.json b/tests/repository_data/client/metadata/previous/targets.json
index 867a42a7..0620bfe4 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 723176bb..0753ea69 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/timestamp.json b/tests/repository_data/client/metadata/previous/timestamp.json
index 2a9e3bf9..3f44ae97 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/client/metadata/previous/timestamp.json.gz b/tests/repository_data/client/metadata/previous/timestamp.json.gz
index c07387c8..f5947694 100644
Binary files a/tests/repository_data/client/metadata/previous/timestamp.json.gz and b/tests/repository_data/client/metadata/previous/timestamp.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/1.root.json b/tests/repository_data/repository/metadata.staged/1.root.json
index 12a773da..94327a11 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/role1.json b/tests/repository_data/repository/metadata.staged/role1.json
index 45e4a14e..96d921b5 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 5f13c8b3..e2fd36f0 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..20b1206a 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 ca3a2767..6074f9bd 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 12a773da..ab8e8dc8 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/root.json.gz b/tests/repository_data/repository/metadata.staged/root.json.gz
index 8f4301f6..b4c12d14 100644
Binary files a/tests/repository_data/repository/metadata.staged/root.json.gz and b/tests/repository_data/repository/metadata.staged/root.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json b/tests/repository_data/repository/metadata.staged/snapshot.json
index 619b05f7..bf565452 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 ff314050..88aa0f12 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 867a42a7..0620bfe4 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 723176bb..0753ea69 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 2a9e3bf9..3f44ae97 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 c07387c8..f5947694 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 12a773da..94327a11 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/role1.json b/tests/repository_data/repository/metadata/role1.json
index 45e4a14e..96d921b5 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 5f13c8b3..e2fd36f0 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..20b1206a 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 ca3a2767..6074f9bd 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 12a773da..ab8e8dc8 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/root.json.gz b/tests/repository_data/repository/metadata/root.json.gz
index 8f4301f6..b4c12d14 100644
Binary files a/tests/repository_data/repository/metadata/root.json.gz and b/tests/repository_data/repository/metadata/root.json.gz differ
diff --git a/tests/repository_data/repository/metadata/snapshot.json b/tests/repository_data/repository/metadata/snapshot.json
index 619b05f7..bf565452 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 ff314050..88aa0f12 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 867a42a7..0620bfe4 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 723176bb..0753ea69 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 2a9e3bf9..3f44ae97 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 c07387c8..f5947694 100644
Binary files a/tests/repository_data/repository/metadata/timestamp.json.gz and b/tests/repository_data/repository/metadata/timestamp.json.gz differ