Repo should canonicalize metadata

This makes sure the metadata is in a consistent order to make it easier
to review changes over times. First, it switches to using cjson to make
sure the map keys are in order, and strings are canonicalized. However
this doesn't sort the arrays in the metadata, since that would change the
signatures.

Change-Id: Id135900d6618bf532e368810e7207485f0fa933e
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/1.root.json b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/1.root.json
index 7e05abd..ba04730 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/1.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/1.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/root.json
index 7e05abd..ba04730 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "5ff5c02ecdfc36583f4fb1a8e660bee1643f82a1a7cb3291739200b9f9be6ee026958af3b342e6d8d4f242a05f8e8558e146b6f692ddd4a7d558b85e82ad9b05"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/snapshot.json
index e794f20..a103860 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "02b79618d27e9b242e0524633ed51760f5d1dfb0299fcb6e6d66de625827e25f6c97b9bdbd9ace10883c3c96aca0ec98b1f75bec59d7868d1284ff9d5f87be09"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "02b79618d27e9b242e0524633ed51760f5d1dfb0299fcb6e6d66de625827e25f6c97b9bdbd9ace10883c3c96aca0ec98b1f75bec59d7868d1284ff9d5f87be09"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "683aae02eb3fcc4fc0ffc37f2f43dc0fdb43e7997d3c65653cfdabcaea9fed8414e3d77047483eca96490747b2a62dec4d17021de42173520f12b60b39ffbc0f"
+					"sha512": "6705a1c5c99c6a782ffed3fdd59309d4c1487a32466cdd236ccc3a5a646b66da0baa8e65d7a9f491ab421f38fe41bf5bae159e5c64a90eac81b8c5b971e0b3e5"
 				},
 				"length": 3832,
 				"version": 1
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e"
+					"sha512": "ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9"
 				},
 				"length": 866,
 				"version": 1
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "30374e6296c813037083321b16c0d2b9578de32a99f56e33134d1936ff14c611e50d0a68bf9e6a2f25dfb449e599f069c51f1c8e3113e36d905a6a0fe825a005"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "30374e6296c813037083321b16c0d2b9578de32a99f56e33134d1936ff14c611e50d0a68bf9e6a2f25dfb449e599f069c51f1c8e3113e36d905a6a0fe825a005"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/targets.json
index 60091e7..a93865c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -12,17 +24,5 @@
 			}
 		},
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/timestamp.json
index 9ba2ee4..f673d3c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/0/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/0/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "33075d29b893290ed4306f50623ad90187a94f9c0b7fd046497f72cb616b33ea45390f186ead3a8c424372a6230d3828c0041460d8da82cfd0c705bd18dada02"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "33075d29b893290ed4306f50623ad90187a94f9c0b7fd046497f72cb616b33ea45390f186ead3a8c424372a6230d3828c0041460d8da82cfd0c705bd18dada02"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "892f57086442891029dd180f01c8653ab91d0ddba2ab6002437634ad0a3579e31e21ef8790577086773ba8b5ffc1da80451589dae92ae122d2943a963fae9725"
+					"sha512": "b8c1e3825bbddeda2c725a436721e75ee6c80214dc5905a9395da7d62df2e2c5866f60320a529cb2113f9c4d88c00bce818b4fb14f7ed014c4205c519afad32c"
 				},
 				"length": 1125,
 				"version": 1
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "f661d41e29185709f03c5fc28498c369153df6be0eee08d11df869046a5b6605471729541ce8d05d9d5f035adac00d531efe6294c99715270c7e8acc5967fb0a"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "f661d41e29185709f03c5fc28498c369153df6be0eee08d11df869046a5b6605471729541ce8d05d9d5f035adac00d531efe6294c99715270c7e8acc5967fb0a"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/2.root.json b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/2.root.json
index efd2263..afd24c8 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/2.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/2.root.json
@@ -1,4 +1,26 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
+		},
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,27 +139,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
-		},
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/root.json
index efd2263..afd24c8 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/root.json
@@ -1,4 +1,26 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
+		},
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,27 +139,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "61cfd8782175d6b88a05088ad57c4147d56328bfeac7a8d2f135e831bb1d9f37eaa32e61405baabec61ae280f5ca47af21a3b2a6ef9866889a0d5eb4ce00fa08"
-		},
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "855ab125077b6a8e00f8224ef9e8bd595d8b5baeae7a4588605702b4279030f6a34dfa4ba544d6c66fcbec92dc7dc4d5df4f744b7b9962b281a24f7e5c264905"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/snapshot.json
index bcf536b..7d3567a 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "322c3c7fdb96573d3e89c4adff9b45ea6ba6531060bd357ae0e4b0c3a2e1e96afd6817f44628e86b4519f47ef4de4ce0b4d0371c8763dc838cb13d6466ee9101"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "322c3c7fdb96573d3e89c4adff9b45ea6ba6531060bd357ae0e4b0c3a2e1e96afd6817f44628e86b4519f47ef4de4ce0b4d0371c8763dc838cb13d6466ee9101"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "4feab9708b19ebd38844cab9879fb6c9c52b6a55c4281030149f696090d4e4ca07ebcaf7c97d6e13f41bae6c332242dda18ebeb63fb2555d759b2283cf8187ab"
+					"sha512": "8835eb20396dade7d38dac0c9f524d49c7eca9228fbb6b2cfe6177f943c1cb22824b48e18768840259a43ab850611c1ab19b1a5a134b75be3aa74baa0a302b92"
 				},
 				"length": 4340,
 				"version": 2
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22"
+					"sha512": "12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183"
 				},
 				"length": 1067,
 				"version": 2
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "9d6b3455d3749f21974ccfe087044ca46254c84e6d0b8a0767e001a4eb6bb2bee19f341cec0c4f752deebd657fdeea7641df661c6a9d224e1d1fe8cee5826203"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "9d6b3455d3749f21974ccfe087044ca46254c84e6d0b8a0767e001a4eb6bb2bee19f341cec0c4f752deebd657fdeea7641df661c6a9d224e1d1fe8cee5826203"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/targets.json
index eeb97eb..da33ed0 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -18,17 +30,5 @@
 			}
 		},
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/timestamp.json
index 7c58b00..d6ca11b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/1/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/1/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "e4e909630f0ac5bc1343aa9bf230a410fa340f959ab779c4460432aaaf3f300ad810f700a73e14b4d0835df60cf435ba8183f0576d6497468a8f3611bfd91105"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "e4e909630f0ac5bc1343aa9bf230a410fa340f959ab779c4460432aaaf3f300ad810f700a73e14b4d0835df60cf435ba8183f0576d6497468a8f3611bfd91105"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "c94cf74bfd65605e8310957476c6cad2102bf9d3c76711a3530ed8e5f38289474fb01ac5747b4977d3ff0a4ddbb3f6767231c1ba54c78a708969807a2d587119"
+					"sha512": "eaeaab2098f5556671422f1b4615d5bb977bf7c0bfe765131ffe77c0e329b4a46e22e68743840be2f43f4e5c736b19c397eacdb6da6aaacd789bde8e97fbb662"
 				},
 				"length": 1126,
 				"version": 2
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "08dc93ecb35c64fe26e319b8a7cb06117d96257c96e4781960f8f0b158f559ec756f8affaafd9b6404494b00525e33b3cd2130f8ea2cb5990e6e5461025ea60c"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "08dc93ecb35c64fe26e319b8a7cb06117d96257c96e4781960f8f0b158f559ec756f8affaafd9b6404494b00525e33b3cd2130f8ea2cb5990e6e5461025ea60c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/3.root.json b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/3.root.json
index af419a2..edb6226 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/3.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/3.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/root.json
index af419a2..edb6226 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "f88ad025e4e486cba6fc97d0a28bc9eb25d8f2148f66fb1929a8c906d5cc7753849ff91a56ade22e4a9d8729347617b75cbc34a5769b1cf1db8cbf2137168c0e"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/snapshot.json
index cc575cd..bc8ea39 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "2e1092cf29aa811658ca7b887e87e3e3bba1fbd73b0bbf3e2cd4f9e6d57eb1240f8fdbf88768f0bedc62f0cd4a91b8c674866567a903335c38fb4267c2a8650f"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "2e1092cf29aa811658ca7b887e87e3e3bba1fbd73b0bbf3e2cd4f9e6d57eb1240f8fdbf88768f0bedc62f0cd4a91b8c674866567a903335c38fb4267c2a8650f"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "baf96d1da4a27b3e57dc35fa1ddde8b20a18f96f6268e07252ed4840725f599d4375ed99d9509f2edde04309efbba71c86735ba630698401cc1778cc31e768f4"
+					"sha512": "a2ee0e1b35acb09e7612f2b25f898e57927509c0b82924ada2b02cd9e00d0c365587601f869d73bceb63ca09e6f2ab17867d15e0aa66d56abbdc8f078d58eecf"
 				},
 				"length": 3832,
 				"version": 3
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4"
+					"sha512": "327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae"
 				},
 				"length": 1268,
 				"version": 3
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "4f202ab758b9a2baefbd23d8fea5deaa8c66d967afa9c52d81df2c17915fc10b059775d53ea858da2c668735f1eb1692f04e2f971545f4ba631f41579e729903"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "4f202ab758b9a2baefbd23d8fea5deaa8c66d967afa9c52d81df2c17915fc10b059775d53ea858da2c668735f1eb1692f04e2f971545f4ba631f41579e729903"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/targets.json
index 147dfc6..006dc9e 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -24,17 +36,5 @@
 			}
 		},
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/timestamp.json
index ffcf0eb..7ba3944 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/2/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/2/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "bc3ac0a0bd96bb932c0eb0489345b1d6864527a883f96b5ff0abf566274879e3f93cff4fc8f403ebd1a61de83df4257af1665fcf8ef71e3e81c5ff2ddc84a008"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "bc3ac0a0bd96bb932c0eb0489345b1d6864527a883f96b5ff0abf566274879e3f93cff4fc8f403ebd1a61de83df4257af1665fcf8ef71e3e81c5ff2ddc84a008"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "27cf44e990df07e40205463d25a12bbacd2ee3dc2650d1a01a37fa0ac27a5e2c885a6e85c2b07e8f56f8bd165cdcd756b182ccfb7f2728709b7a77a7b2251e86"
+					"sha512": "3c0f40a92f7ba68eec5157235036b680a5a20e33fa9dba6830cf1d857373def2f4af9d5cc69fbd4e755bc2fb66f86deca7675cbb14c7020304345415638ef5ea"
 				},
 				"length": 1126,
 				"version": 3
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "9d1c694c4037e0f7d9665ae450ba1b3be30f0a882942802991986f3211788fc347edba9b90a6eeed54c20d9bf5ed9434b0e088a79d7ad2185d16a1b8589bce0f"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "9d1c694c4037e0f7d9665ae450ba1b3be30f0a882942802991986f3211788fc347edba9b90a6eeed54c20d9bf5ed9434b0e088a79d7ad2185d16a1b8589bce0f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/4.root.json b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/4.root.json
index c0966ce..430ab50 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/4.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/4.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/root.json
index c0966ce..430ab50 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "780d8db1d802ef7ccaa23ae9bcccf7b619d820a505ae75f61453ebbc882ce4dff37194ee112f3da22feba8cc89531329872e22704a75a21658a5ec38ee568c00"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/snapshot.json
index 788252b..7d4397f 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "833369d5faae4078ce70f89a903f22cb8f34ec1458f31529a9e9ab25503fb4213da2cd22f4c42da21a71ca0ac5d93db389d373bc0299433568d138a7c70e7906"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "833369d5faae4078ce70f89a903f22cb8f34ec1458f31529a9e9ab25503fb4213da2cd22f4c42da21a71ca0ac5d93db389d373bc0299433568d138a7c70e7906"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "f23ff2acc0678a3e5d75d192417e3d008c35aa1143fb65807c46310b28a0c2cb88c94fc8d29bef3bebf81ef1c32db0cec6f5f00359c6259f22346a252ddf664d"
+					"sha512": "7209e1e9171f3af74702c37524b49a989214c5b357d31250514166245da7843f3e9a07a7ec1b909d9761a715e247a0f878f76db83740a891dac625f312bb64a2"
 				},
 				"length": 3832,
 				"version": 4
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461"
+					"sha512": "3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b"
 				},
 				"length": 1469,
 				"version": 4
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "a076e6f99019484fc5daf715a62967e23a2ee94e8847298f5bc8ca21d0ae91207f0098dbd368c287d4468142c2ce29a74c9cecff0368a09673af1b2b0313dd00"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "a076e6f99019484fc5daf715a62967e23a2ee94e8847298f5bc8ca21d0ae91207f0098dbd368c287d4468142c2ce29a74c9cecff0368a09673af1b2b0313dd00"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/targets.json
index c960d1c..86ff69b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -30,17 +42,5 @@
 			}
 		},
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/timestamp.json
index 2d62fa2..63a1a73 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/3/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/3/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "414501c7f3ac0fa00eb91a3a5bfa3efb65b56ac3f9f15953e1fbbdfdd5417d5e73f5bd679b3c1178416094b4189951ac990c9bf8fb0ad6d0ce42a54d6df5a301"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "414501c7f3ac0fa00eb91a3a5bfa3efb65b56ac3f9f15953e1fbbdfdd5417d5e73f5bd679b3c1178416094b4189951ac990c9bf8fb0ad6d0ce42a54d6df5a301"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "3e1518698609a8ea5dc88323cbc3c7f487346cf489db59ff6c74d232372c3d77217416c5ccbdcf3172cb79df93ed635c3981663f2019f958a6f6a84cd443aee3"
+					"sha512": "0ab6b99130398978b8f78b886a6c1cd40ed762f143c24582d61c722c22a25b2e21ed5d733a262a945d58599574383d5da8f060f5918c9cb335eee14aca61f71e"
 				},
 				"length": 1126,
 				"version": 4
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "87d09d36cd148d9e7947353514818cb1ae455962acec5f98c1d8941755d1a515bc8f0cdde4602fd2eb25999c2e842f60882fa1e8d9dc97dbf6442e6f4c8c4e0e"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "87d09d36cd148d9e7947353514818cb1ae455962acec5f98c1d8941755d1a515bc8f0cdde4602fd2eb25999c2e842f60882fa1e8d9dc97dbf6442e6f4c8c4e0e"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/5.root.json b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/5.root.json
index 75f57ce..99d7f2b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/5.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/5.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/root.json
index 75f57ce..99d7f2b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": false,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "b9bec20a6e47c15ee0abae1ec2314bf129d838c0996be90dfa5ef5983354d2c55b83ddf2fbd9d783fb82d16f4b1106af8b01331bbd9648807e42f0eaafecb600"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/snapshot.json
index 8f96582..3099d17 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "34fe8427e7ff8a5ec480578f5ef299a25d33b59423eb0bb17edd10c036419d0d2b952e259736258d0bb5f727e4cc642f950b3c52c103ad4af689e65b7e610700"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "34fe8427e7ff8a5ec480578f5ef299a25d33b59423eb0bb17edd10c036419d0d2b952e259736258d0bb5f727e4cc642f950b3c52c103ad4af689e65b7e610700"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "1d328734fe2f05dcf8527fd56dc2be8eb93f0c55f71d14aa6e8ad756d9d0a9dd41355df2712aaf992adc50add64ffde009a56cde02c4792e8c2d3b694ac70fc3"
+					"sha512": "60dd4582e3c412272f8de69bf5b9d646b013a20dd098d01fe7cc97ef2c3924e3f6d01ef4970d592c01af5a74f2ab009bfc321ccfb11bb1679a5112780e027fb6"
 				},
 				"length": 3832,
 				"version": 5
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db"
+					"sha512": "1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6"
 				},
 				"length": 1670,
 				"version": 5
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "e7b397e79f9fe7c12a662abbc99424b615790c64065e1ed66f6ce46d48ac0132a8c90e93ae3e7bfe5a75279cd015dbf52ef1a73c543697f1de5bb059072b7d02"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "e7b397e79f9fe7c12a662abbc99424b615790c64065e1ed66f6ce46d48ac0132a8c90e93ae3e7bfe5a75279cd015dbf52ef1a73c543697f1de5bb059072b7d02"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/targets.json
index 7dc9094..84ee825 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -36,17 +48,5 @@
 			}
 		},
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/timestamp.json
index 0119345..8e312fd 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/4/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/4/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
+			"method": "ed25519",
+			"sig": "f83f70864d7a175570035ddfe1e1438839757c08b7cb0a157eb7dbcade6ca8bb7ce81e3fc96e775e524c03af894ae671fecd60ba6af8234ab68a340b20b1a50a"
+		},
+		{
+			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
+			"method": "ed25519",
+			"sig": "f83f70864d7a175570035ddfe1e1438839757c08b7cb0a157eb7dbcade6ca8bb7ce81e3fc96e775e524c03af894ae671fecd60ba6af8234ab68a340b20b1a50a"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "f3285e9249d6fe5c693a9766c8f9efbfb915349213f155cfc7e511e40fc43134b9925c589efb9cc561edf3bea182e4b61e23dc8434c00e0bf1a35dea1a7c81d9"
+					"sha512": "d7534a04f6c9c81b129da4a51d75b28dd5654b9c4ecdfc8e9a3fa53d8893839b9fd5ff2e1861dd367852b9a8f6b0fbc3d1c8a58a50528fbc3186799dca90cf90"
 				},
 				"length": 1126,
 				"version": 5
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
-			"method": "ed25519",
-			"sig": "efeb3f5a53fd6c6c9e03cb3ac48dccc9a7ff050108e89dc85d83b8ad56d7b752174c0d0ee60621982da9858c8d468844cc0f3d011ff0b121e58f34b6af1a1f0b"
-		},
-		{
-			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
-			"method": "ed25519",
-			"sig": "efeb3f5a53fd6c6c9e03cb3ac48dccc9a7ff050108e89dc85d83b8ad56d7b752174c0d0ee60621982da9858c8d468844cc0f3d011ff0b121e58f34b6af1a1f0b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/5/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-false/5/repository/snapshot.json
index 96ad437..d801fdd 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/5/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/5/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "99c55d0fdb697e8957b7239b30da1a95b5cccef186e1bdfe7f9c70172d11a36835235eaba6bde3f4e0965cc3192b4805945125538392487089e3ced95ce4ee01"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "99c55d0fdb697e8957b7239b30da1a95b5cccef186e1bdfe7f9c70172d11a36835235eaba6bde3f4e0965cc3192b4805945125538392487089e3ced95ce4ee01"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "1d328734fe2f05dcf8527fd56dc2be8eb93f0c55f71d14aa6e8ad756d9d0a9dd41355df2712aaf992adc50add64ffde009a56cde02c4792e8c2d3b694ac70fc3"
+					"sha512": "60dd4582e3c412272f8de69bf5b9d646b013a20dd098d01fe7cc97ef2c3924e3f6d01ef4970d592c01af5a74f2ab009bfc321ccfb11bb1679a5112780e027fb6"
 				},
 				"length": 3832,
 				"version": 5
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "8ec9b98766edfe6acc23bb700183532a990b966ceb7b62784f6c80d4b1bfe5661df3cc2765b57bd0e78eb4b5c2b136f5ab7a365665c6e918d4137b83cb7e2262"
+					"sha512": "2a274dfd4112ff00c705f5d1c453f12a57367be2935f8f180f87331973cd47d5d07bf7366cc33a03632c3146f5bd02fc43a677692b5fce32720abcac142ccf28"
 				},
 				"length": 1871,
 				"version": 6
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "cf36c85855679c11e0efb1cc53deb1a1bfd43d02e8fb564e6c280f1ef280a62fe05368336fdbe59daa642313b28479accfed25f4a3c8be9cc1d0474ab87c150f"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "cf36c85855679c11e0efb1cc53deb1a1bfd43d02e8fb564e6c280f1ef280a62fe05368336fdbe59daa642313b28479accfed25f4a3c8be9cc1d0474ab87c150f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/5/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-false/5/repository/targets.json
index 3f07d3d..cd2d970 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/5/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/5/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -42,17 +54,5 @@
 			}
 		},
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-false/5/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-false/5/repository/timestamp.json
index 00124e2..5270cfb 100644
--- a/client/testdata/go-tuf/consistent-snapshot-false/5/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-false/5/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
+			"method": "ed25519",
+			"sig": "4844cfe2907b5db71f9725753d5cca33b18fe2e623e216551795a5cd798299ab7ea5e805220511dd05f311246458c1c7e89611ffcb2fe5e23827091ec4520d04"
+		},
+		{
+			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
+			"method": "ed25519",
+			"sig": "4844cfe2907b5db71f9725753d5cca33b18fe2e623e216551795a5cd798299ab7ea5e805220511dd05f311246458c1c7e89611ffcb2fe5e23827091ec4520d04"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "416d5114cfe34e8412cc68c85a1aaded17f53d8ba77f4c3fa769835904ae664d729711e88e1a90c2a6bc4f3c61e46eb026c0a1da5a22c7d28a3103c82c6b284a"
+					"sha512": "a00f86649a8f05022cd4ee92d9280498a2b1f79e4b1f832a26d6fe485cb18b1717df8b41658ab6376ff3cd68509538b237ce79509ec9af55e03a9167cff163fa"
 				},
 				"length": 1126,
 				"version": 6
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
-			"method": "ed25519",
-			"sig": "d238cb69543dc66c40e5f9d5bcf58d43e6c99e5559399be52c08f6a7c29809a4d7c50014ea631f871b5e2be28264b0c682eafe775297888bc883061214c55600"
-		},
-		{
-			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
-			"method": "ed25519",
-			"sig": "d238cb69543dc66c40e5f9d5bcf58d43e6c99e5559399be52c08f6a7c29809a4d7c50014ea631f871b5e2be28264b0c682eafe775297888bc883061214c55600"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.root.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.root.json
index 93189d2..ecc0fe5 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.snapshot.json
index 7bf654d..0e63c30 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "38056bce2651d61bd87fc6a8f16857300fa852774581801aed6576e6b805d51e6f57fcf1d2529a8dfde9516083905acc794416cc6372d2ca66f1aaf4c543aa03"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "38056bce2651d61bd87fc6a8f16857300fa852774581801aed6576e6b805d51e6f57fcf1d2529a8dfde9516083905acc794416cc6372d2ca66f1aaf4c543aa03"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3"
+					"sha512": "f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6"
 				},
 				"length": 3831,
 				"version": 1
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e"
+					"sha512": "ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9"
 				},
 				"length": 866,
 				"version": 1
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "f2ee59f04d66fa5a73249e985bae22e04bad839131334b630a2bd57566a2da2e5c32179c147daac927909a88a4896cc541dc30129450549c63b41bb5f0506e0d"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "f2ee59f04d66fa5a73249e985bae22e04bad839131334b630a2bd57566a2da2e5c32179c147daac927909a88a4896cc541dc30129450549c63b41bb5f0506e0d"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.targets.json
index 60091e7..a93865c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/1.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -12,17 +24,5 @@
 			}
 		},
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
deleted file mode 100644
index 7bf654d..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"signed": {
-		"_type": "snapshot",
-		"expires": "2100-01-01T00:00:00Z",
-		"meta": {
-			"root.json": {
-				"hashes": {
-					"sha512": "bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3"
-				},
-				"length": 3831,
-				"version": 1
-			},
-			"targets.json": {
-				"hashes": {
-					"sha512": "6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e"
-				},
-				"length": 866,
-				"version": 1
-			}
-		},
-		"spec_version": "1.0",
-		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "f2ee59f04d66fa5a73249e985bae22e04bad839131334b630a2bd57566a2da2e5c32179c147daac927909a88a4896cc541dc30129450549c63b41bb5f0506e0d"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "f2ee59f04d66fa5a73249e985bae22e04bad839131334b630a2bd57566a2da2e5c32179c147daac927909a88a4896cc541dc30129450549c63b41bb5f0506e0d"
-		}
-	]
-}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
new file mode 100644
index 0000000..0e63c30
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
@@ -0,0 +1,36 @@
+{
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "38056bce2651d61bd87fc6a8f16857300fa852774581801aed6576e6b805d51e6f57fcf1d2529a8dfde9516083905acc794416cc6372d2ca66f1aaf4c543aa03"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "38056bce2651d61bd87fc6a8f16857300fa852774581801aed6576e6b805d51e6f57fcf1d2529a8dfde9516083905acc794416cc6372d2ca66f1aaf4c543aa03"
+		}
+	],
+	"signed": {
+		"_type": "snapshot",
+		"expires": "2100-01-01T00:00:00Z",
+		"meta": {
+			"root.json": {
+				"hashes": {
+					"sha512": "f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6"
+				},
+				"length": 3831,
+				"version": 1
+			},
+			"targets.json": {
+				"hashes": {
+					"sha512": "ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9"
+				},
+				"length": 866,
+				"version": 1
+			}
+		},
+		"spec_version": "1.0",
+		"version": 1
+	}
+}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/0/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
rename to client/testdata/go-tuf/consistent-snapshot-true/0/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
index 93189d2..ecc0fe5 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
similarity index 98%
rename from client/testdata/go-tuf/consistent-snapshot-true/0/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
rename to client/testdata/go-tuf/consistent-snapshot-true/0/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
index 60091e7..a93865c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -12,17 +24,5 @@
 			}
 		},
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/root.json
index 93189d2..ecc0fe5 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "485c97e0bb392ee60f9644cdd430f1325cb2329a8c0223fc69b209061d8f3a72268a087f4a715f5a0f70f967edaecebdcc8e9fc914ea8aff1c9741d495f5f904"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/snapshot.json
index 7bf654d..0e63c30 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "38056bce2651d61bd87fc6a8f16857300fa852774581801aed6576e6b805d51e6f57fcf1d2529a8dfde9516083905acc794416cc6372d2ca66f1aaf4c543aa03"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "38056bce2651d61bd87fc6a8f16857300fa852774581801aed6576e6b805d51e6f57fcf1d2529a8dfde9516083905acc794416cc6372d2ca66f1aaf4c543aa03"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3"
+					"sha512": "f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6"
 				},
 				"length": 3831,
 				"version": 1
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e"
+					"sha512": "ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9"
 				},
 				"length": 866,
 				"version": 1
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "f2ee59f04d66fa5a73249e985bae22e04bad839131334b630a2bd57566a2da2e5c32179c147daac927909a88a4896cc541dc30129450549c63b41bb5f0506e0d"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "f2ee59f04d66fa5a73249e985bae22e04bad839131334b630a2bd57566a2da2e5c32179c147daac927909a88a4896cc541dc30129450549c63b41bb5f0506e0d"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/targets.json
index 60091e7..a93865c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -12,17 +24,5 @@
 			}
 		},
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/timestamp.json
index ca0d4e3..16abd4a 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/0/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/0/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "dad1c2d52621fcd70bec1ea366909b53181a0178063f448bfac9d27090e61ce798f1b5b8dcd72a011f6664a4cb014a4425d68d9b82fe55efa6edc38323d8ec0c"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "dad1c2d52621fcd70bec1ea366909b53181a0178063f448bfac9d27090e61ce798f1b5b8dcd72a011f6664a4cb014a4425d68d9b82fe55efa6edc38323d8ec0c"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4"
+					"sha512": "be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55"
 				},
 				"length": 1125,
 				"version": 1
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 1
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "1b51547737f70f5a3c4ee95c4ae9698d571777dd8b0a3c5d57af266beb95802889b3d7ba9062ff06e85427f05b76ad193d5f3ca45e1be86a266e53b2d0526504"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "1b51547737f70f5a3c4ee95c4ae9698d571777dd8b0a3c5d57af266beb95802889b3d7ba9062ff06e85427f05b76ad193d5f3ca45e1be86a266e53b2d0526504"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
similarity index 98%
rename from client/testdata/go-tuf/consistent-snapshot-true/1/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
rename to client/testdata/go-tuf/consistent-snapshot-true/1/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
index eeb97eb..da33ed0 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -18,17 +30,5 @@
 			}
 		},
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.root.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.root.json
index 911c87f..5a71dac 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.root.json
@@ -1,4 +1,26 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
+		},
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,27 +139,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
-		},
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.snapshot.json
index 43bfdc1..22c8390 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "ab9bae209f200977200a8f0222644087f7fb8732385e32bfdd72ba91ccaa0e3bbe009f102ee4e14c78e6c0d4d023f62e28d0ac928e33eb38f498fcf9c7853706"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "ab9bae209f200977200a8f0222644087f7fb8732385e32bfdd72ba91ccaa0e3bbe009f102ee4e14c78e6c0d4d023f62e28d0ac928e33eb38f498fcf9c7853706"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098"
+					"sha512": "6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1"
 				},
 				"length": 4339,
 				"version": 2
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22"
+					"sha512": "12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183"
 				},
 				"length": 1067,
 				"version": 2
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "f5b71b0dfefa020f7110d8767d5a6b7a98f6a71a89a3819cd54ae628081502b3bd18e8c7f1254f53a5346088deaee66fdd359ae365ea3758f0dc0032e9517a05"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "f5b71b0dfefa020f7110d8767d5a6b7a98f6a71a89a3819cd54ae628081502b3bd18e8c7f1254f53a5346088deaee66fdd359ae365ea3758f0dc0032e9517a05"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.targets.json
index eeb97eb..da33ed0 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/2.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -18,17 +30,5 @@
 			}
 		},
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
deleted file mode 100644
index 43bfdc1..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"signed": {
-		"_type": "snapshot",
-		"expires": "2100-01-01T00:00:00Z",
-		"meta": {
-			"root.json": {
-				"hashes": {
-					"sha512": "93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098"
-				},
-				"length": 4339,
-				"version": 2
-			},
-			"targets.json": {
-				"hashes": {
-					"sha512": "118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22"
-				},
-				"length": 1067,
-				"version": 2
-			}
-		},
-		"spec_version": "1.0",
-		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "f5b71b0dfefa020f7110d8767d5a6b7a98f6a71a89a3819cd54ae628081502b3bd18e8c7f1254f53a5346088deaee66fdd359ae365ea3758f0dc0032e9517a05"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "f5b71b0dfefa020f7110d8767d5a6b7a98f6a71a89a3819cd54ae628081502b3bd18e8c7f1254f53a5346088deaee66fdd359ae365ea3758f0dc0032e9517a05"
-		}
-	]
-}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
deleted file mode 120000
index 027671c..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../0/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/1/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
rename to client/testdata/go-tuf/consistent-snapshot-true/1/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
index 911c87f..5a71dac 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
@@ -1,4 +1,26 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
+		},
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,27 +139,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
-		},
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
deleted file mode 120000
index aecd947..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../0/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
new file mode 100644
index 0000000..22c8390
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
@@ -0,0 +1,36 @@
+{
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "ab9bae209f200977200a8f0222644087f7fb8732385e32bfdd72ba91ccaa0e3bbe009f102ee4e14c78e6c0d4d023f62e28d0ac928e33eb38f498fcf9c7853706"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "ab9bae209f200977200a8f0222644087f7fb8732385e32bfdd72ba91ccaa0e3bbe009f102ee4e14c78e6c0d4d023f62e28d0ac928e33eb38f498fcf9c7853706"
+		}
+	],
+	"signed": {
+		"_type": "snapshot",
+		"expires": "2100-01-01T00:00:00Z",
+		"meta": {
+			"root.json": {
+				"hashes": {
+					"sha512": "6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1"
+				},
+				"length": 4339,
+				"version": 2
+			},
+			"targets.json": {
+				"hashes": {
+					"sha512": "12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183"
+				},
+				"length": 1067,
+				"version": 2
+			}
+		},
+		"spec_version": "1.0",
+		"version": 2
+	}
+}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
new file mode 120000
index 0000000..7b0737c
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
@@ -0,0 +1 @@
+../../0/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
deleted file mode 120000
index 70b171e..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../0/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
new file mode 120000
index 0000000..140bfa4
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
@@ -0,0 +1 @@
+../../0/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
new file mode 120000
index 0000000..eb80782
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
@@ -0,0 +1 @@
+../../0/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/root.json
index 911c87f..5a71dac 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/root.json
@@ -1,4 +1,26 @@
 {
+	"signatures": [
+		{
+			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
+			"method": "ed25519",
+			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
+		},
+		{
+			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
+			"method": "ed25519",
+			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
+		},
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,27 +139,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "160f5ae5e7017bc783bbbe26c5419bbeeeb87f507b140ef474da0517d56549f7",
-			"method": "ed25519",
-			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
-		},
-		{
-			"keyid": "f806b84c8763453d011c0ba830a3290ee4be587969f5325117c7626411a0f953",
-			"method": "ed25519",
-			"sig": "eaca65a09fb8f16ebc7c4560e9d23875225c0fd0f84747542a23e2dd9942fcf4c2bebd7292f06e1eaaf242048103594107353b75eea161bfe15ab24bfd752706"
-		},
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "0dd9685391cc229d15c468fb3a71d93780bf1220b82e97c5dc6384db76eab74b9254478c89c26f5cf86f640e6a49d0a9d6990ba151fb862648181c8c029f470d"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/snapshot.json
index 43bfdc1..22c8390 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "ab9bae209f200977200a8f0222644087f7fb8732385e32bfdd72ba91ccaa0e3bbe009f102ee4e14c78e6c0d4d023f62e28d0ac928e33eb38f498fcf9c7853706"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "ab9bae209f200977200a8f0222644087f7fb8732385e32bfdd72ba91ccaa0e3bbe009f102ee4e14c78e6c0d4d023f62e28d0ac928e33eb38f498fcf9c7853706"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098"
+					"sha512": "6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1"
 				},
 				"length": 4339,
 				"version": 2
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22"
+					"sha512": "12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183"
 				},
 				"length": 1067,
 				"version": 2
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "f5b71b0dfefa020f7110d8767d5a6b7a98f6a71a89a3819cd54ae628081502b3bd18e8c7f1254f53a5346088deaee66fdd359ae365ea3758f0dc0032e9517a05"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "f5b71b0dfefa020f7110d8767d5a6b7a98f6a71a89a3819cd54ae628081502b3bd18e8c7f1254f53a5346088deaee66fdd359ae365ea3758f0dc0032e9517a05"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/targets.json
index eeb97eb..da33ed0 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		},
+		{
+			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
+			"method": "ed25519",
+			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -18,17 +30,5 @@
 			}
 		},
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "b1eb1d74c0e65524c85f96f9badf09a4d2ed1259fb427fc689fc2279ebb4d867",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		},
-		{
-			"keyid": "d77999c3b2d553fceee309cc47bf7ab2fee37b8a0b30d4033e4b40dc09719556",
-			"method": "ed25519",
-			"sig": "81bcf5921834a20b8b0946815ad4316f43ffce20b3793e6653dc5fd4b98f1c6318ce2243948574e82414a102717a6f2d731250b3191c54abc8391fd867503e0b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/timestamp.json
index 884a54b..2d90b7d 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/1/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/1/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "59a0d2c985c802eaf191112107c25ea68831e0d3527b35daf93fbefa2fe347796ecc1443bcc7611b2ea0b513d666a02aedbe9bd85e95b76e6975899865df8c07"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "59a0d2c985c802eaf191112107c25ea68831e0d3527b35daf93fbefa2fe347796ecc1443bcc7611b2ea0b513d666a02aedbe9bd85e95b76e6975899865df8c07"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9"
+					"sha512": "9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f"
 				},
 				"length": 1126,
 				"version": 2
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 2
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "c077ad4567c1db81609c89ab80310de559a2045d58a7f0166269f82e6d33a326248414ff7e5eb2d876d7741652ea1b6fab61f9bc774a6592727ac248a196720f"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "c077ad4567c1db81609c89ab80310de559a2045d58a7f0166269f82e6d33a326248414ff7e5eb2d876d7741652ea1b6fab61f9bc774a6592727ac248a196720f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
deleted file mode 120000
index 0018c82..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../1/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
new file mode 120000
index 0000000..eda1f19
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
@@ -0,0 +1 @@
+../../1/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
deleted file mode 100644
index c6303cd..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"signed": {
-		"_type": "snapshot",
-		"expires": "2100-01-01T00:00:00Z",
-		"meta": {
-			"root.json": {
-				"hashes": {
-					"sha512": "590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94"
-				},
-				"length": 3831,
-				"version": 3
-			},
-			"targets.json": {
-				"hashes": {
-					"sha512": "bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4"
-				},
-				"length": 1268,
-				"version": 3
-			}
-		},
-		"spec_version": "1.0",
-		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "b3aa3119a74147ceb37b98248638710da5741c635e5791b13fd851b37212e4d3d5e7f6cbd4122b232a4010c13332c3048c1c6cc3e2838934ed481e6959441f05"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "b3aa3119a74147ceb37b98248638710da5741c635e5791b13fd851b37212e4d3d5e7f6cbd4122b232a4010c13332c3048c1c6cc3e2838934ed481e6959441f05"
-		}
-	]
-}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
deleted file mode 120000
index 69cd01d..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../1/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.root.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.root.json
index deacdc1..795059a 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.snapshot.json
index c6303cd..4d37f3d 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "1fd3194960f690d4633713bed743b96ee747897a2fcc5c238ad8fc3e08157b8fb8b586ca77d7b152b4119059febde736651a765c926ff5c9daacfd2e03c7d304"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "1fd3194960f690d4633713bed743b96ee747897a2fcc5c238ad8fc3e08157b8fb8b586ca77d7b152b4119059febde736651a765c926ff5c9daacfd2e03c7d304"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94"
+					"sha512": "9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e"
 				},
 				"length": 3831,
 				"version": 3
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4"
+					"sha512": "327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae"
 				},
 				"length": 1268,
 				"version": 3
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "b3aa3119a74147ceb37b98248638710da5741c635e5791b13fd851b37212e4d3d5e7f6cbd4122b232a4010c13332c3048c1c6cc3e2838934ed481e6959441f05"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "b3aa3119a74147ceb37b98248638710da5741c635e5791b13fd851b37212e4d3d5e7f6cbd4122b232a4010c13332c3048c1c6cc3e2838934ed481e6959441f05"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.targets.json
index 147dfc6..006dc9e 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/3.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -24,17 +36,5 @@
 			}
 		},
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
similarity index 98%
rename from client/testdata/go-tuf/consistent-snapshot-true/2/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
rename to client/testdata/go-tuf/consistent-snapshot-true/2/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
index 147dfc6..006dc9e 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -24,17 +36,5 @@
 			}
 		},
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
deleted file mode 120000
index 944d357..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../1/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
new file mode 100644
index 0000000..4d37f3d
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
@@ -0,0 +1,36 @@
+{
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "1fd3194960f690d4633713bed743b96ee747897a2fcc5c238ad8fc3e08157b8fb8b586ca77d7b152b4119059febde736651a765c926ff5c9daacfd2e03c7d304"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "1fd3194960f690d4633713bed743b96ee747897a2fcc5c238ad8fc3e08157b8fb8b586ca77d7b152b4119059febde736651a765c926ff5c9daacfd2e03c7d304"
+		}
+	],
+	"signed": {
+		"_type": "snapshot",
+		"expires": "2100-01-01T00:00:00Z",
+		"meta": {
+			"root.json": {
+				"hashes": {
+					"sha512": "9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e"
+				},
+				"length": 3831,
+				"version": 3
+			},
+			"targets.json": {
+				"hashes": {
+					"sha512": "327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae"
+				},
+				"length": 1268,
+				"version": 3
+			}
+		},
+		"spec_version": "1.0",
+		"version": 3
+	}
+}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
new file mode 120000
index 0000000..9bccbd1
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
@@ -0,0 +1 @@
+../../1/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
deleted file mode 120000
index de6ef37..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../1/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
deleted file mode 120000
index f8bb03c..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../1/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
new file mode 120000
index 0000000..cf73758
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
@@ -0,0 +1 @@
+../../1/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/2/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
rename to client/testdata/go-tuf/consistent-snapshot-true/2/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
index deacdc1..795059a 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
new file mode 120000
index 0000000..dd19124
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
@@ -0,0 +1 @@
+../../1/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
deleted file mode 120000
index ce078d7..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../1/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
new file mode 120000
index 0000000..e4a55aa
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
@@ -0,0 +1 @@
+../../1/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
new file mode 120000
index 0000000..6475172
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
@@ -0,0 +1 @@
+../../1/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/root.json
index deacdc1..795059a 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "d11082d75a4e60f9c5d1d176dfea4d7c43a41a9d4595a8b14b844a43c329bf86d2bf4eb8d6255af1afd97bbd5cfc1a69f038a82617cbfcfb82c6434e1790c702"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/snapshot.json
index c6303cd..4d37f3d 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
+			"method": "ed25519",
+			"sig": "1fd3194960f690d4633713bed743b96ee747897a2fcc5c238ad8fc3e08157b8fb8b586ca77d7b152b4119059febde736651a765c926ff5c9daacfd2e03c7d304"
+		},
+		{
+			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
+			"method": "ed25519",
+			"sig": "1fd3194960f690d4633713bed743b96ee747897a2fcc5c238ad8fc3e08157b8fb8b586ca77d7b152b4119059febde736651a765c926ff5c9daacfd2e03c7d304"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94"
+					"sha512": "9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e"
 				},
 				"length": 3831,
 				"version": 3
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4"
+					"sha512": "327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae"
 				},
 				"length": 1268,
 				"version": 3
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "d792ff8cf3c5d9a8fe0fdfa585b25028fa9f49aa29c62a658140d4b98cc2c917",
-			"method": "ed25519",
-			"sig": "b3aa3119a74147ceb37b98248638710da5741c635e5791b13fd851b37212e4d3d5e7f6cbd4122b232a4010c13332c3048c1c6cc3e2838934ed481e6959441f05"
-		},
-		{
-			"keyid": "7165b3cf2ad6a10d456498d958e80f2356b0d3a230d93a96a8dada5fdd8dd40d",
-			"method": "ed25519",
-			"sig": "b3aa3119a74147ceb37b98248638710da5741c635e5791b13fd851b37212e4d3d5e7f6cbd4122b232a4010c13332c3048c1c6cc3e2838934ed481e6959441f05"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/targets.json
index 147dfc6..006dc9e 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -24,17 +36,5 @@
 			}
 		},
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "09593c7b47f4dbf1e8ac949fa010279ffbbd36070a54a89b689378441e8111602d4236fa2962063778c82027d4746a8973ba8fea86e9c105190da9fa362d8b0c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/timestamp.json
index 2356947..50d8fa5 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/2/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/2/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "99d55cabd53b3be293ece4af9f25310e2742d72fd7bf9c51b26d120ef568d557ca7260c1262c072e5ce79c8ed454984692b66be29909d4d0d6c0aa502f68b304"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "99d55cabd53b3be293ece4af9f25310e2742d72fd7bf9c51b26d120ef568d557ca7260c1262c072e5ce79c8ed454984692b66be29909d4d0d6c0aa502f68b304"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432"
+					"sha512": "439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739"
 				},
 				"length": 1126,
 				"version": 3
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 3
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "25122819bb1e9fcd7383d0a13a35a049470162140b1573eb139e4269e29ec31b77a9771396bf2c9719c9ddb4e167e2e5ebabfef229cb4f16b59db45c6fdb4508"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "25122819bb1e9fcd7383d0a13a35a049470162140b1573eb139e4269e29ec31b77a9771396bf2c9719c9ddb4e167e2e5ebabfef229cb4f16b59db45c6fdb4508"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
deleted file mode 120000
index 32bd324..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
new file mode 120000
index 0000000..ab79e72
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
@@ -0,0 +1 @@
+../../2/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
deleted file mode 100644
index 6671723..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"signed": {
-		"_type": "snapshot",
-		"expires": "2100-01-01T00:00:00Z",
-		"meta": {
-			"root.json": {
-				"hashes": {
-					"sha512": "765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa"
-				},
-				"length": 3831,
-				"version": 4
-			},
-			"targets.json": {
-				"hashes": {
-					"sha512": "7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461"
-				},
-				"length": 1469,
-				"version": 4
-			}
-		},
-		"spec_version": "1.0",
-		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "4619db132982f96f2f7d62d1ea5e7bfdc69eab8cf10cc6eca8721557144a8b193b98f6c3a25da862c414da348d42cee78b59c3f14903be937b16b39e1003f503"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "4619db132982f96f2f7d62d1ea5e7bfdc69eab8cf10cc6eca8721557144a8b193b98f6c3a25da862c414da348d42cee78b59c3f14903be937b16b39e1003f503"
-		}
-	]
-}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
deleted file mode 120000
index 03468a1..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
deleted file mode 120000
index b20325e..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
new file mode 120000
index 0000000..699059b
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
@@ -0,0 +1 @@
+../../2/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
deleted file mode 120000
index d137215..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/3/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
rename to client/testdata/go-tuf/consistent-snapshot-true/3/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
index c960d1c..86ff69b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -30,17 +42,5 @@
 			}
 		},
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.root.json
index 8ccb8d7..b3dee4c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.snapshot.json
index 6671723..2689f0f 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "3bff99538fe65f12bc08da4f3c433f73a6027ffdc159a2b79eac6de5b6469f41e6b37f773f305aee05dbcf83beafa5316935a1688c383d8292d88d1ff349950f"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "3bff99538fe65f12bc08da4f3c433f73a6027ffdc159a2b79eac6de5b6469f41e6b37f773f305aee05dbcf83beafa5316935a1688c383d8292d88d1ff349950f"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa"
+					"sha512": "641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c"
 				},
 				"length": 3831,
 				"version": 4
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461"
+					"sha512": "3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b"
 				},
 				"length": 1469,
 				"version": 4
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "4619db132982f96f2f7d62d1ea5e7bfdc69eab8cf10cc6eca8721557144a8b193b98f6c3a25da862c414da348d42cee78b59c3f14903be937b16b39e1003f503"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "4619db132982f96f2f7d62d1ea5e7bfdc69eab8cf10cc6eca8721557144a8b193b98f6c3a25da862c414da348d42cee78b59c3f14903be937b16b39e1003f503"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.targets.json
index c960d1c..86ff69b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/4.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -30,17 +42,5 @@
 			}
 		},
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
new file mode 120000
index 0000000..31ee49d
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
@@ -0,0 +1 @@
+../../2/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
deleted file mode 120000
index f966ccc..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/3/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
rename to client/testdata/go-tuf/consistent-snapshot-true/3/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
index 8ccb8d7..b3dee4c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
new file mode 120000
index 0000000..1e8bdd3
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
@@ -0,0 +1 @@
+../../2/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
deleted file mode 120000
index 77a3656..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
deleted file mode 120000
index 49199f1..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
new file mode 120000
index 0000000..a2ff9c6
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
@@ -0,0 +1 @@
+../../2/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
new file mode 120000
index 0000000..a88f32f
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
@@ -0,0 +1 @@
+../../2/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
deleted file mode 120000
index 4e721c7..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
new file mode 120000
index 0000000..9242252
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
@@ -0,0 +1 @@
+../../2/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
deleted file mode 120000
index f1f205a..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../2/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
new file mode 100644
index 0000000..2689f0f
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
@@ -0,0 +1,36 @@
+{
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "3bff99538fe65f12bc08da4f3c433f73a6027ffdc159a2b79eac6de5b6469f41e6b37f773f305aee05dbcf83beafa5316935a1688c383d8292d88d1ff349950f"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "3bff99538fe65f12bc08da4f3c433f73a6027ffdc159a2b79eac6de5b6469f41e6b37f773f305aee05dbcf83beafa5316935a1688c383d8292d88d1ff349950f"
+		}
+	],
+	"signed": {
+		"_type": "snapshot",
+		"expires": "2100-01-01T00:00:00Z",
+		"meta": {
+			"root.json": {
+				"hashes": {
+					"sha512": "641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c"
+				},
+				"length": 3831,
+				"version": 4
+			},
+			"targets.json": {
+				"hashes": {
+					"sha512": "3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b"
+				},
+				"length": 1469,
+				"version": 4
+			}
+		},
+		"spec_version": "1.0",
+		"version": 4
+	}
+}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
new file mode 120000
index 0000000..42dd8fc
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
@@ -0,0 +1 @@
+../../2/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
new file mode 120000
index 0000000..63b2e1d
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
@@ -0,0 +1 @@
+../../2/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/root.json
index 8ccb8d7..b3dee4c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "5a5afbd4270a2638b84f50d0291e35acdf59e25492914017cb317c617d71c3a9c450d3f71f1dd7a33c369399d8de26f3a61060146682d84159f27c08f1675005"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/snapshot.json
index 6671723..2689f0f 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "3bff99538fe65f12bc08da4f3c433f73a6027ffdc159a2b79eac6de5b6469f41e6b37f773f305aee05dbcf83beafa5316935a1688c383d8292d88d1ff349950f"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "3bff99538fe65f12bc08da4f3c433f73a6027ffdc159a2b79eac6de5b6469f41e6b37f773f305aee05dbcf83beafa5316935a1688c383d8292d88d1ff349950f"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa"
+					"sha512": "641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c"
 				},
 				"length": 3831,
 				"version": 4
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461"
+					"sha512": "3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b"
 				},
 				"length": 1469,
 				"version": 4
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "4619db132982f96f2f7d62d1ea5e7bfdc69eab8cf10cc6eca8721557144a8b193b98f6c3a25da862c414da348d42cee78b59c3f14903be937b16b39e1003f503"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "4619db132982f96f2f7d62d1ea5e7bfdc69eab8cf10cc6eca8721557144a8b193b98f6c3a25da862c414da348d42cee78b59c3f14903be937b16b39e1003f503"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/targets.json
index c960d1c..86ff69b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -30,17 +42,5 @@
 			}
 		},
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "7bfe0a63ee324034807b5341336d9d2d64e9ef3936086577b5bbcc6d021b4656bd6bf14d817bbb3908e4dcb05391d1b4031b527c14d942c2d1e38275d5ff1308"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/timestamp.json
index ebdf9f8..56a99ec 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/3/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/3/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
+			"method": "ed25519",
+			"sig": "0ecdd948200b154885036a719ed306a152946bb4676743838a24b60416c5095e0d32fc63a76afa10d759367c79e01d9cf36dbca956441b1e30e33a8e4f35a504"
+		},
+		{
+			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
+			"method": "ed25519",
+			"sig": "0ecdd948200b154885036a719ed306a152946bb4676743838a24b60416c5095e0d32fc63a76afa10d759367c79e01d9cf36dbca956441b1e30e33a8e4f35a504"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7"
+					"sha512": "d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1"
 				},
 				"length": 1126,
 				"version": 4
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 4
-	},
-	"signatures": [
-		{
-			"keyid": "b59406a55fbe2492022f2951dacd01fc7b400b7b41ec4028b8356161a5a71a33",
-			"method": "ed25519",
-			"sig": "a14cd9dfc17e257aa7f5d6586e32defbc076d1aa3cb30fd86be362f0c528df3145aeba52f5eceb8fab481336b95667c9009fb639bfe996cbe11412c60226320a"
-		},
-		{
-			"keyid": "c7a2ca868b0e65b50cc6a2dfcfd9c129bdcb3da390ac78bb83a732be02ed5a5d",
-			"method": "ed25519",
-			"sig": "a14cd9dfc17e257aa7f5d6586e32defbc076d1aa3cb30fd86be362f0c528df3145aeba52f5eceb8fab481336b95667c9009fb639bfe996cbe11412c60226320a"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d.root.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/4/repository/8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd.root.json
rename to client/testdata/go-tuf/consistent-snapshot-true/4/repository/02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d.root.json
index a9f853e..bc3464b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
deleted file mode 120000
index 71b4225..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
new file mode 120000
index 0000000..0ba823b
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
@@ -0,0 +1 @@
+../../3/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
deleted file mode 120000
index 11937d8..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
deleted file mode 120000
index 0e10c4d..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6.targets.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/4/repository/c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db.targets.json
rename to client/testdata/go-tuf/consistent-snapshot-true/4/repository/1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6.targets.json
index 7dc9094..84ee825 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -36,17 +48,5 @@
 			}
 		},
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
deleted file mode 120000
index 5780021..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
new file mode 120000
index 0000000..85790f5
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
@@ -0,0 +1 @@
+../../3/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
deleted file mode 120000
index 98160f7..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
new file mode 120000
index 0000000..042c542
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
@@ -0,0 +1 @@
+../../3/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
new file mode 120000
index 0000000..f856697
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
@@ -0,0 +1 @@
+../../3/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.root.json
index a9f853e..bc3464b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.snapshot.json
index 882ff3a..a1c7679 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "bade626bd7f7e6811aefbb26b0a47227d98e893207c6a448f36cb4ba67b2f7d008c62531168637428ba59e5e20c893406800522c40e71a4f81141ee48f63de06"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "bade626bd7f7e6811aefbb26b0a47227d98e893207c6a448f36cb4ba67b2f7d008c62531168637428ba59e5e20c893406800522c40e71a4f81141ee48f63de06"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd"
+					"sha512": "02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d"
 				},
 				"length": 3831,
 				"version": 5
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db"
+					"sha512": "1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6"
 				},
 				"length": 1670,
 				"version": 5
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "1d473b59dec8a119fb8bc1e5b33c3b0896f62598d0b560cc7a98f501bdc9436fb2399219f8d0301081fe9db22f6734bd1b865a3b9040c3a5357e67d0dc89880f"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "1d473b59dec8a119fb8bc1e5b33c3b0896f62598d0b560cc7a98f501bdc9436fb2399219f8d0301081fe9db22f6734bd1b865a3b9040c3a5357e67d0dc89880f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.targets.json
index 7dc9094..84ee825 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/5.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -36,17 +48,5 @@
 			}
 		},
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
deleted file mode 120000
index fcb3707..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
new file mode 120000
index 0000000..d7f1f5e
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
@@ -0,0 +1 @@
+../../3/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
new file mode 120000
index 0000000..92fa65c
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
@@ -0,0 +1 @@
+../../3/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
deleted file mode 120000
index 21e403f..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
deleted file mode 120000
index 37511d0..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
deleted file mode 120000
index 29e8425..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
deleted file mode 120000
index 26fca70..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
new file mode 120000
index 0000000..bde36ac
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
@@ -0,0 +1 @@
+../../3/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
new file mode 120000
index 0000000..894891e
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
@@ -0,0 +1 @@
+../../3/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
deleted file mode 120000
index b978f58..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
new file mode 120000
index 0000000..db6fc8a
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
@@ -0,0 +1 @@
+../../3/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
deleted file mode 120000
index c420672..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../3/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12.snapshot.json
new file mode 100644
index 0000000..a1c7679
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12.snapshot.json
@@ -0,0 +1,36 @@
+{
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "bade626bd7f7e6811aefbb26b0a47227d98e893207c6a448f36cb4ba67b2f7d008c62531168637428ba59e5e20c893406800522c40e71a4f81141ee48f63de06"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "bade626bd7f7e6811aefbb26b0a47227d98e893207c6a448f36cb4ba67b2f7d008c62531168637428ba59e5e20c893406800522c40e71a4f81141ee48f63de06"
+		}
+	],
+	"signed": {
+		"_type": "snapshot",
+		"expires": "2100-01-01T00:00:00Z",
+		"meta": {
+			"root.json": {
+				"hashes": {
+					"sha512": "02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d"
+				},
+				"length": 3831,
+				"version": 5
+			},
+			"targets.json": {
+				"hashes": {
+					"sha512": "1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6"
+				},
+				"length": 1670,
+				"version": 5
+			}
+		},
+		"spec_version": "1.0",
+		"version": 5
+	}
+}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
new file mode 120000
index 0000000..d53cece
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
@@ -0,0 +1 @@
+../../3/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c.snapshot.json
deleted file mode 100644
index 882ff3a..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c.snapshot.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"signed": {
-		"_type": "snapshot",
-		"expires": "2100-01-01T00:00:00Z",
-		"meta": {
-			"root.json": {
-				"hashes": {
-					"sha512": "8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd"
-				},
-				"length": 3831,
-				"version": 5
-			},
-			"targets.json": {
-				"hashes": {
-					"sha512": "c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db"
-				},
-				"length": 1670,
-				"version": 5
-			}
-		},
-		"spec_version": "1.0",
-		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "1d473b59dec8a119fb8bc1e5b33c3b0896f62598d0b560cc7a98f501bdc9436fb2399219f8d0301081fe9db22f6734bd1b865a3b9040c3a5357e67d0dc89880f"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "1d473b59dec8a119fb8bc1e5b33c3b0896f62598d0b560cc7a98f501bdc9436fb2399219f8d0301081fe9db22f6734bd1b865a3b9040c3a5357e67d0dc89880f"
-		}
-	]
-}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
new file mode 120000
index 0000000..6638304
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
@@ -0,0 +1 @@
+../../3/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
new file mode 120000
index 0000000..7e729a4
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
@@ -0,0 +1 @@
+../../3/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/root.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/root.json
index a9f853e..bc3464b 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/root.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/root.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
+			"method": "ed25519",
+			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
+		},
+		{
+			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
+			"method": "ed25519",
+			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
+		}
+	],
 	"signed": {
 		"_type": "root",
 		"consistent_snapshot": true,
@@ -117,17 +129,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "4c663b6d0b9f2c74a19b6791c1417c8d1916e2d84461be1a8148e4386c89582d",
-			"method": "ed25519",
-			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
-		},
-		{
-			"keyid": "a67ca94ed559c97db79999d32b79ca35b5ae1795d2f6be3eafa3bd5816a8f2c4",
-			"method": "ed25519",
-			"sig": "1d3e90aac8b4fad8846d3ae59ed9069ba335310bd14259a6ca6a905499a9b166761c3c737cbef6d231f84b78575d2cb543caba350a1fcaa104589c86cf2e890c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/snapshot.json
index 882ff3a..a1c7679 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "bade626bd7f7e6811aefbb26b0a47227d98e893207c6a448f36cb4ba67b2f7d008c62531168637428ba59e5e20c893406800522c40e71a4f81141ee48f63de06"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "bade626bd7f7e6811aefbb26b0a47227d98e893207c6a448f36cb4ba67b2f7d008c62531168637428ba59e5e20c893406800522c40e71a4f81141ee48f63de06"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd"
+					"sha512": "02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d"
 				},
 				"length": 3831,
 				"version": 5
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db"
+					"sha512": "1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6"
 				},
 				"length": 1670,
 				"version": 5
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "1d473b59dec8a119fb8bc1e5b33c3b0896f62598d0b560cc7a98f501bdc9436fb2399219f8d0301081fe9db22f6734bd1b865a3b9040c3a5357e67d0dc89880f"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "1d473b59dec8a119fb8bc1e5b33c3b0896f62598d0b560cc7a98f501bdc9436fb2399219f8d0301081fe9db22f6734bd1b865a3b9040c3a5357e67d0dc89880f"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/targets.json
index 7dc9094..84ee825 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -36,17 +48,5 @@
 			}
 		},
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "68f2346cdbe045e8558b2ccd86be66e15466955167557c704b51d7163838f670c53ab9247c16a4ed0cd4ecc981a7e2a04a350b01548f97654499d6f9c17c4202"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/timestamp.json
index 142621e..b8fb70a 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/4/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/4/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
+			"method": "ed25519",
+			"sig": "28f096d2c69c31b599715d919703438955f827bec6c74c13bc8b3430c978e81f61dcf616b63309df38d34803bb9cdc683a8727d2aae6ff69e0e5131d05566f0c"
+		},
+		{
+			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
+			"method": "ed25519",
+			"sig": "28f096d2c69c31b599715d919703438955f827bec6c74c13bc8b3430c978e81f61dcf616b63309df38d34803bb9cdc683a8727d2aae6ff69e0e5131d05566f0c"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c"
+					"sha512": "c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12"
 				},
 				"length": 1126,
 				"version": 5
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 5
-	},
-	"signatures": [
-		{
-			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
-			"method": "ed25519",
-			"sig": "82aa747d16c493b0b92c32de5832bf447d2f2348970f066598835d11efba303bc9685e3436200a88778d78a50111df81639d206c5e09b491989bec461a98550b"
-		},
-		{
-			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
-			"method": "ed25519",
-			"sig": "82aa747d16c493b0b92c32de5832bf447d2f2348970f066598835d11efba303bc9685e3436200a88778d78a50111df81639d206c5e09b491989bec461a98550b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d.root.json
new file mode 120000
index 0000000..b8fd98c
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d.root.json
@@ -0,0 +1 @@
+../../4/repository/02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
deleted file mode 120000
index d1949f9..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/118c2a2b6b9f7bc667dca8404a2671910a22b6fe48e460816a9f6f2be66f7806a789c9dc4880d2c2812c0bc7607caac30cc0a8299183fd7228e1049f6920ce22.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
new file mode 120000
index 0000000..9fead46
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
@@ -0,0 +1 @@
+../../4/repository/12d99e8850abd30f0a13a7129158fd317b1602b5ae5d2352594745ac4bbee5b3b4da549509e9ed914bde4825c375e233b032d62c4a1ddcb22742bd7e354aa183.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
deleted file mode 120000
index 8106e59..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/148c273a895a85127bb254edd19da2190176272446cd0f43220aba2b0f72fe954a2eab52c38daf67b1c3cbe877848d01266d8a1af3e858c8d004682a3393f3a7.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
deleted file mode 120000
index 1c73279..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/15c2c14fb300cecb52c9ef9a88545759028ec5d7e0f028269ba828c2199e3f0e56f963bdcfd0897c51ebb95ee2452666ec7f65bae688b48db1b8aa8de944e432.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6.targets.json
new file mode 120000
index 0000000..ea02621
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6.targets.json
@@ -0,0 +1 @@
+../../4/repository/1c7d53886259e47c988705a20e75ebbdc10b74f0ee8309f61ea9751ca243769c8f3e46b285c6266eadf379451fd5df3ba6098aaecc923d56491bf164704409b6.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
deleted file mode 120000
index 237b697..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/23170400c30b4bbcd375c88ae22104241e377006e9c40c64ed49aef9ad2bdfa49ba2832ccb9c3776aaee336195de73cda28b5ba65fb468f7a5e60b870cbe26e9.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/8ec9b98766edfe6acc23bb700183532a990b966ceb7b62784f6c80d4b1bfe5661df3cc2765b57bd0e78eb4b5c2b136f5ab7a365665c6e918d4137b83cb7e2262.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/2a274dfd4112ff00c705f5d1c453f12a57367be2935f8f180f87331973cd47d5d07bf7366cc33a03632c3146f5bd02fc43a677692b5fce32720abcac142ccf28.targets.json
similarity index 99%
rename from client/testdata/go-tuf/consistent-snapshot-true/5/repository/8ec9b98766edfe6acc23bb700183532a990b966ceb7b62784f6c80d4b1bfe5661df3cc2765b57bd0e78eb4b5c2b136f5ab7a365665c6e918d4137b83cb7e2262.targets.json
rename to client/testdata/go-tuf/consistent-snapshot-true/5/repository/2a274dfd4112ff00c705f5d1c453f12a57367be2935f8f180f87331973cd47d5d07bf7366cc33a03632c3146f5bd02fc43a677692b5fce32720abcac142ccf28.targets.json
index 3f07d3d..cd2d970 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/8ec9b98766edfe6acc23bb700183532a990b966ceb7b62784f6c80d4b1bfe5661df3cc2765b57bd0e78eb4b5c2b136f5ab7a365665c6e918d4137b83cb7e2262.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/2a274dfd4112ff00c705f5d1c453f12a57367be2935f8f180f87331973cd47d5d07bf7366cc33a03632c3146f5bd02fc43a677692b5fce32720abcac142ccf28.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -42,17 +54,5 @@
 			}
 		},
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
new file mode 120000
index 0000000..8363bf9
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
@@ -0,0 +1 @@
+../../4/repository/327855226e0cbfb0fddf2eb0b86fb1923c7e71aeee20cbd1753a04de1d5508f65d94ba6a0948084c8249c1bd3466f4109b8974828fe561786bc7234069d794ae.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
deleted file mode 120000
index aad4346..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/33b282c1970996734deff944f2862f84b196f0b2b67dfa7383f75f95ef3e8673602aa411e05572075729ead6caa35df6720ce5723fd67c63d4aaa81dd966c5a4.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
new file mode 120000
index 0000000..ebc49e8
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
@@ -0,0 +1 @@
+../../4/repository/3daf06c5f0e632e8648504a23ebc7db7aaefaa536b24eaf029d57e49f517e80765524fb04b287573376658d9834cdb9fffdbeaaba98616a590bb47634191455b.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
new file mode 120000
index 0000000..7996999
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
@@ -0,0 +1 @@
+../../4/repository/439381acf645030090b17172e514dd74ce2b54def75e70ebbf90ba675bb599e8321806810cc9c603b60f132d86032e5ca796c302456a10f5aa2ddb9feeffc739.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
deleted file mode 120000
index 102fb8f..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/590c7d2df37495eae436e25eea548eb48294ef63aaeebe51b1bc1056c149fd54710c67d231c19c14708824aa7095e0028b6691fcf21c1edfcc7a88a48d4b7b94.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.snapshot.json
index 15ab63b..7c6c236 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "23d26b1cb87a6c2b4bb61fa6c534cbb0745546fc303344eb9363e228a0c579d460e8299f8d69ac9b4b9577f2f0c08fc89fb2080ecd3ef2fdb1a7b4bc0fa51c0e"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "23d26b1cb87a6c2b4bb61fa6c534cbb0745546fc303344eb9363e228a0c579d460e8299f8d69ac9b4b9577f2f0c08fc89fb2080ecd3ef2fdb1a7b4bc0fa51c0e"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd"
+					"sha512": "02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d"
 				},
 				"length": 3831,
 				"version": 5
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "8ec9b98766edfe6acc23bb700183532a990b966ceb7b62784f6c80d4b1bfe5661df3cc2765b57bd0e78eb4b5c2b136f5ab7a365665c6e918d4137b83cb7e2262"
+					"sha512": "2a274dfd4112ff00c705f5d1c453f12a57367be2935f8f180f87331973cd47d5d07bf7366cc33a03632c3146f5bd02fc43a677692b5fce32720abcac142ccf28"
 				},
 				"length": 1871,
 				"version": 6
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "61f3a52657285ee76cac838dcf7bd605c8b895dadd7877f5ef3aaa8b22ec0e952fa44c9d9145d5740e56568d5c772c4ca46f96458c813d24c61596cfddff350b"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "61f3a52657285ee76cac838dcf7bd605c8b895dadd7877f5ef3aaa8b22ec0e952fa44c9d9145d5740e56568d5c772c4ca46f96458c813d24c61596cfddff350b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.targets.json
index 3f07d3d..cd2d970 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6.targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -42,17 +54,5 @@
 			}
 		},
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/63c16cc2225e77b7c94ec3b143271e02d97a1bfba828e11820392b9108412ef22f09732694673331f386b6f8a281103e20d07c21db78f487e1b046d9968173c8.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/63c16cc2225e77b7c94ec3b143271e02d97a1bfba828e11820392b9108412ef22f09732694673331f386b6f8a281103e20d07c21db78f487e1b046d9968173c8.snapshot.json
deleted file mode 100644
index 15ab63b..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/63c16cc2225e77b7c94ec3b143271e02d97a1bfba828e11820392b9108412ef22f09732694673331f386b6f8a281103e20d07c21db78f487e1b046d9968173c8.snapshot.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"signed": {
-		"_type": "snapshot",
-		"expires": "2100-01-01T00:00:00Z",
-		"meta": {
-			"root.json": {
-				"hashes": {
-					"sha512": "8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd"
-				},
-				"length": 3831,
-				"version": 5
-			},
-			"targets.json": {
-				"hashes": {
-					"sha512": "8ec9b98766edfe6acc23bb700183532a990b966ceb7b62784f6c80d4b1bfe5661df3cc2765b57bd0e78eb4b5c2b136f5ab7a365665c6e918d4137b83cb7e2262"
-				},
-				"length": 1871,
-				"version": 6
-			}
-		},
-		"spec_version": "1.0",
-		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "61f3a52657285ee76cac838dcf7bd605c8b895dadd7877f5ef3aaa8b22ec0e952fa44c9d9145d5740e56568d5c772c4ca46f96458c813d24c61596cfddff350b"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "61f3a52657285ee76cac838dcf7bd605c8b895dadd7877f5ef3aaa8b22ec0e952fa44c9d9145d5740e56568d5c772c4ca46f96458c813d24c61596cfddff350b"
-		}
-	]
-}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
new file mode 120000
index 0000000..9917f4c
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
@@ -0,0 +1 @@
+../../4/repository/641492df5945edfc0a19e9fba14ab48cb6c1b9770458bb89cd3be793ae3447809362e6c82f7897581dc3594e1851db214b77e00f059487db13a7cf6e51b26b5c.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
new file mode 120000
index 0000000..78e571b
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
@@ -0,0 +1 @@
+../../4/repository/6e4f473eef9c8d1ccbaed33d2e0101e10dd5f1cb4b79854d662c59c34ec4d5da916b9f4555c5c122415794311c55dd23107c9a3c8e6beae84abbe772474a02e1.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
deleted file mode 120000
index 18eed32..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/6ecff211b4df20d84e5a99a1145b7f96752efe880147439a3a8c2ecc080762f84b5b784da1b41d2ccb1492d112c521b4b82973589285dfbcfbb6c423c559ff4e.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
deleted file mode 120000
index 9bad4bd..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/765d0de07adc4de8aa6060a9c579c70938f0a6e998d76ad75363945fdb998b8019d4d42a00642141ac8a86346098dfb40bc7be32d684077be5aae06495f57cfa.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
deleted file mode 120000
index eed6123..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/7c7a5e381e1e8c3f10bc4ab1c1d33f6460f741a5c0bbeb8be4f206de58e9ce67964bef7cef0738d22d5c55238d2062a2a9a72c99f6df0c57a2bece6435a3e461.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd.root.json
deleted file mode 120000
index 9e5a79b..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
deleted file mode 120000
index 557a157..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/93b38df5b9cb993dd7e2e16e9b8dd07386b35936f21c36b7527e1587052dce86f64b5eb5669fffe86b4aae4c581a2bbba6e49d780d8687dd6c304fae9b6fe098.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
new file mode 120000
index 0000000..bc493e4
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
@@ -0,0 +1 @@
+../../4/repository/9c9c9e6ae38c1d7c86678400a6addc849ce218f4db1da359320934de389ba2ef7864a8233dff3eea4a7415a827d6fdb81a5f71f723ef8b5d498bdb5b526d6f4f.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
new file mode 120000
index 0000000..79de838
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
@@ -0,0 +1 @@
+../../4/repository/9f8cd605423ee44e79a9753fd3dc649aa94aa91c07372faf9129714ba63dd36390b974afc7c6be99438f09344ace9aee15ee42dd3feb07a9018bdb312e71707e.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
deleted file mode 120000
index 60975e4..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/bdcbdfe0a1ecaaf9c0c5dc9728bc2eebb1c931b17e57676bd251f8b05640826dcf923ed854c235247329e7068c0d01ad6920b4454a976feb0c9f29b64e338ee4.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
new file mode 120000
index 0000000..526916a
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
@@ -0,0 +1 @@
+../../4/repository/be6d8b504eb5b9d6ca62560cac184f3133610f82142a7d49da6b7e0b84e927d570b0316d5de51b13782366bca29e201d5ed179e8433b93e5c903f0ebe06ded55.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
deleted file mode 120000
index abbc6bd..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/bf4f7f4a062fd3780055d98572619db84d6d6c9b9b647bf6bca1190e984963ffb86189fb455110f4c13956ce9cbe72d95d03c5e6d72295414ac6bbcc3d1957c3.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12.snapshot.json
new file mode 120000
index 0000000..6625844
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12.snapshot.json
@@ -0,0 +1 @@
+../../4/repository/c494d7a1f7a5c8ba572821aaffcb1875f19bc7e52153dff886362a4e5190ffd5ff2eaa9f32d2880c8d3e84ad0183dec1acb1b54304703b696aac1b1e551cca12.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db.targets.json
deleted file mode 120000
index b786bfa..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db.targets.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/c86fd75fe946b88488ece0fa399857a75f3cc80bd85bc71f3fcc030ad6201c559370cbc67a8a547f1964355911fc0ef8000dd8e9f0ff84a3cc8e45cbd42ec7db.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/cdb084b923a5203799957de747d4e97bbd95c8883659697ecedd423be568360c7ee7e0bac99a06b84e2d6e20de3f26e5b48f2d8e4cf89fdd3ab2675c474a1700.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/cdb084b923a5203799957de747d4e97bbd95c8883659697ecedd423be568360c7ee7e0bac99a06b84e2d6e20de3f26e5b48f2d8e4cf89fdd3ab2675c474a1700.snapshot.json
new file mode 100644
index 0000000..7c6c236
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/cdb084b923a5203799957de747d4e97bbd95c8883659697ecedd423be568360c7ee7e0bac99a06b84e2d6e20de3f26e5b48f2d8e4cf89fdd3ab2675c474a1700.snapshot.json
@@ -0,0 +1,36 @@
+{
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "23d26b1cb87a6c2b4bb61fa6c534cbb0745546fc303344eb9363e228a0c579d460e8299f8d69ac9b4b9577f2f0c08fc89fb2080ecd3ef2fdb1a7b4bc0fa51c0e"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "23d26b1cb87a6c2b4bb61fa6c534cbb0745546fc303344eb9363e228a0c579d460e8299f8d69ac9b4b9577f2f0c08fc89fb2080ecd3ef2fdb1a7b4bc0fa51c0e"
+		}
+	],
+	"signed": {
+		"_type": "snapshot",
+		"expires": "2100-01-01T00:00:00Z",
+		"meta": {
+			"root.json": {
+				"hashes": {
+					"sha512": "02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d"
+				},
+				"length": 3831,
+				"version": 5
+			},
+			"targets.json": {
+				"hashes": {
+					"sha512": "2a274dfd4112ff00c705f5d1c453f12a57367be2935f8f180f87331973cd47d5d07bf7366cc33a03632c3146f5bd02fc43a677692b5fce32720abcac142ccf28"
+				},
+				"length": 1871,
+				"version": 6
+			}
+		},
+		"spec_version": "1.0",
+		"version": 6
+	}
+}
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
new file mode 120000
index 0000000..941a044
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
@@ -0,0 +1 @@
+../../4/repository/d3398b6392c3f5664f98fd77d555184dd599d7779582f4b4205fcc0aae9d1308a079f349f9b49b69795a84042e1df20544f484713104f2c61f6a6409176974b1.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c.snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c.snapshot.json
deleted file mode 120000
index ef1e443..0000000
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c.snapshot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../4/repository/dce60b87bbc2b98c1e4cc86cc5798d381561600934b0da7d044ed72511dafefc5e4e640a76e59ea96f6c9edf1a002974180e1562b0496127fcb44ca6b08c294c.snapshot.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
new file mode 120000
index 0000000..92ffd81
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
@@ -0,0 +1 @@
+../../4/repository/f636c620a877affcbd4b3f8d191a3309b8c4ba32440e7ec390859b355f4df669a78da6af69fedec7bf88b2f11876c2c4f36f11b2139235078ff820cbea2225b6.root.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
new file mode 120000
index 0000000..84d29bf
--- /dev/null
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
@@ -0,0 +1 @@
+../../4/repository/ffc941531e4f1f7f43ad5445283400b961c9fd1ac7fd80a36f6b21ab90e2e20f77dd9e721fbf07c59588c738d39b7dcd4acbc0c844874e85c5f6cb4271e6ccf9.targets.json
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/snapshot.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/snapshot.json
index 15ab63b..7c6c236 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/snapshot.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/snapshot.json
@@ -1,18 +1,30 @@
 {
+	"signatures": [
+		{
+			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
+			"method": "ed25519",
+			"sig": "23d26b1cb87a6c2b4bb61fa6c534cbb0745546fc303344eb9363e228a0c579d460e8299f8d69ac9b4b9577f2f0c08fc89fb2080ecd3ef2fdb1a7b4bc0fa51c0e"
+		},
+		{
+			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
+			"method": "ed25519",
+			"sig": "23d26b1cb87a6c2b4bb61fa6c534cbb0745546fc303344eb9363e228a0c579d460e8299f8d69ac9b4b9577f2f0c08fc89fb2080ecd3ef2fdb1a7b4bc0fa51c0e"
+		}
+	],
 	"signed": {
 		"_type": "snapshot",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"root.json": {
 				"hashes": {
-					"sha512": "8aae80ec8056a31ca28304ed0b0b35f0dacb11c5d6684cc7200086ff237fec23dc1e3fc2b43afb968d780c8053bd4081f4ae7ca71a066894042b1d24983fc0fd"
+					"sha512": "02464dc0610d58b5c99ccbc71efb523af841dcd4e6324a12d4e78a89bc8228766870a5b5d8b55cc5d5e373f36c27626844986346aaab1860ca50ead516cd409d"
 				},
 				"length": 3831,
 				"version": 5
 			},
 			"targets.json": {
 				"hashes": {
-					"sha512": "8ec9b98766edfe6acc23bb700183532a990b966ceb7b62784f6c80d4b1bfe5661df3cc2765b57bd0e78eb4b5c2b136f5ab7a365665c6e918d4137b83cb7e2262"
+					"sha512": "2a274dfd4112ff00c705f5d1c453f12a57367be2935f8f180f87331973cd47d5d07bf7366cc33a03632c3146f5bd02fc43a677692b5fce32720abcac142ccf28"
 				},
 				"length": 1871,
 				"version": 6
@@ -20,17 +32,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "bed15bf57ba4deb4e09667099d45d119504420983d16fd0927ebfb0c25184e7f",
-			"method": "ed25519",
-			"sig": "61f3a52657285ee76cac838dcf7bd605c8b895dadd7877f5ef3aaa8b22ec0e952fa44c9d9145d5740e56568d5c772c4ca46f96458c813d24c61596cfddff350b"
-		},
-		{
-			"keyid": "ad7c98dfb3b99024f8b49e33f3d92e66537f0abab78a84f1e4b667dfbf52bf60",
-			"method": "ed25519",
-			"sig": "61f3a52657285ee76cac838dcf7bd605c8b895dadd7877f5ef3aaa8b22ec0e952fa44c9d9145d5740e56568d5c772c4ca46f96458c813d24c61596cfddff350b"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/targets.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/targets.json
index 3f07d3d..cd2d970 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/targets.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/targets.json
@@ -1,4 +1,16 @@
 {
+	"signatures": [
+		{
+			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		},
+		{
+			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
+			"method": "ed25519",
+			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
+		}
+	],
 	"signed": {
 		"_type": "targets",
 		"expires": "2100-01-01T00:00:00Z",
@@ -42,17 +54,5 @@
 			}
 		},
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "a3eba2113e37b749b908101bdb7b856a44f2853641830c0f939730aca3e30360",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		},
-		{
-			"keyid": "0efcc6a8d07a1cb5955fb698b8ea57e903b6924854f5a025c90f16c9a52b2700",
-			"method": "ed25519",
-			"sig": "1e80ae84c4badf194e2fd7225c120999d8f628598fa0e994a2ff7cac705ec2f14601a64ba5370fc668f3fb114975dd81c554400d757f41762c4e12eb4db35d02"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/timestamp.json b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/timestamp.json
index fb03158..e2cb48c 100644
--- a/client/testdata/go-tuf/consistent-snapshot-true/5/repository/timestamp.json
+++ b/client/testdata/go-tuf/consistent-snapshot-true/5/repository/timestamp.json
@@ -1,11 +1,23 @@
 {
+	"signatures": [
+		{
+			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
+			"method": "ed25519",
+			"sig": "c39d19cb31096e38a6e69f2a650a95273ecb54d2859a0f7ec13286a56f572aacd1775bc12b1716411bbb577beb30f82ea540179abae824caeef5dedaf7a38f05"
+		},
+		{
+			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
+			"method": "ed25519",
+			"sig": "c39d19cb31096e38a6e69f2a650a95273ecb54d2859a0f7ec13286a56f572aacd1775bc12b1716411bbb577beb30f82ea540179abae824caeef5dedaf7a38f05"
+		}
+	],
 	"signed": {
 		"_type": "timestamp",
 		"expires": "2100-01-01T00:00:00Z",
 		"meta": {
 			"snapshot.json": {
 				"hashes": {
-					"sha512": "63c16cc2225e77b7c94ec3b143271e02d97a1bfba828e11820392b9108412ef22f09732694673331f386b6f8a281103e20d07c21db78f487e1b046d9968173c8"
+					"sha512": "cdb084b923a5203799957de747d4e97bbd95c8883659697ecedd423be568360c7ee7e0bac99a06b84e2d6e20de3f26e5b48f2d8e4cf89fdd3ab2675c474a1700"
 				},
 				"length": 1126,
 				"version": 6
@@ -13,17 +25,5 @@
 		},
 		"spec_version": "1.0",
 		"version": 6
-	},
-	"signatures": [
-		{
-			"keyid": "79b5760e4c96b6becc12bec4260c9c1d533b9b70628ade2b229ef02b772b10b0",
-			"method": "ed25519",
-			"sig": "93de7e13e6ad7b03be3c299169aba2cf1fed7a6bac8b3059ca858e4a709063b6a0237b78614e9101c9beed0d9f470bfcd77644108246688d75cf58b243ea1f0c"
-		},
-		{
-			"keyid": "e23c19fb64db7146965700b9983df63d2dd4362b1f99d74da2383234da4ab20d",
-			"method": "ed25519",
-			"sig": "93de7e13e6ad7b03be3c299169aba2cf1fed7a6bac8b3059ca858e4a709063b6a0237b78614e9101c9beed0d9f470bfcd77644108246688d75cf58b243ea1f0c"
-		}
-	]
+	}
 }
\ No newline at end of file
diff --git a/repo.go b/repo.go
index e36bd4b..1a192ee 100644
--- a/repo.go
+++ b/repo.go
@@ -13,6 +13,7 @@
 	"github.com/flynn/go-tuf/sign"
 	"github.com/flynn/go-tuf/util"
 	"github.com/flynn/go-tuf/verify"
+	"github.com/tent/canonical-json-go"
 )
 
 type CompressionType uint8
@@ -414,11 +415,21 @@
 }
 
 func (r *Repo) jsonMarshal(v interface{}) ([]byte, error) {
-	if r.prefix == "" && r.indent == "" {
-		return json.Marshal(v)
-	} else {
-		return json.MarshalIndent(v, r.prefix, r.indent)
+	b, err := cjson.Marshal(v)
+	if err != nil {
+		return []byte{}, err
 	}
+
+	if r.prefix == "" && r.indent == "" {
+		return b, nil
+	}
+
+	var out bytes.Buffer
+	if err := json.Indent(&out, b, r.prefix, r.indent); err != nil {
+		return []byte{}, err
+	}
+
+	return out.Bytes(), nil
 }
 
 func (r *Repo) setMeta(name string, meta interface{}) error {