diff --git a/tests/repository_data/client/metadata/current/root.json b/tests/repository_data/client/metadata/current/root.json
index 914c5b6641..f4c8ad4215 100644
--- a/tests/repository_data/client/metadata/current/root.json
+++ b/tests/repository_data/client/metadata/current/root.json
@@ -3,7 +3,7 @@
   {
    "keyid": "6986b667c736a3b37471e030cf4ce7aa6c7e0d530325e64c2660276b77be3754",
    "method": "RSASSA-PSS",
-   "sig": "434559983d8e535eb43f1acda08cc645a98fdcb0d9d42968e9dc8609ea83961c97dc1905581295594a41615d0bfaab09f6df12420b2181f8ffb5379fcf570ea0d0fd6a3b41e72abfb0b8b0070d54627ddac6273d6165bba5927d786478e9c2cd968ab10307874d1b9eb52c307b57da0c9f9c91c9a00ec85d1c0d4d75283cceb3567e2b45476ab381d6166fd6804d0e611504d1e894b324a591d4201be1423f19f1d6d4267742a8ae59a992b96da572b96f7d8e469ce3d63d41e95768cbe7fc242a30b7c09d2343f7acc74fa4d07901cd521312652dbd1ea493508d74850b8e75dd2da45a97d5a8a079ef4c1be26d4691b3282c732b428fa08db0ecf2e7973a53"
+   "sig": "a710ca79819bb01452e0a1091612bf1282644bdd7c10aa73d125ad99d7773fb8580d432d3e2b930954637c5177ea0a9322c8f64dde373df920cd3d31ffd7ea01362015a882754529314b9c870a532aa87fcb735f3f932bfebac3b4b2a286871e942f86a9a5deb4370c9f24f18a85aaa01c91fd67547c7fc8b21d7433bc28c8eda5223df2843b79a38cc84498267269f85d2422374852597b47ee1b58e336b8cbc401f4545d565914e475c4c9546ea6e45dcdcce3f049af7476d9db9cafbcb6400d1cd4e590d108f31fb6ff38f5a134b2f2b386207c0a217572461735f1e4a78107c6cd023a417ed721dcbb904fec375cca2572b159239930d99962d0ad4033a5"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/client/metadata/current/root.json.gz b/tests/repository_data/client/metadata/current/root.json.gz
new file mode 100644
index 0000000000..655ba429bd
Binary files /dev/null and b/tests/repository_data/client/metadata/current/root.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/snapshot.json b/tests/repository_data/client/metadata/current/snapshot.json
index f1dddeeddb..d528363e3c 100644
--- a/tests/repository_data/client/metadata/current/snapshot.json
+++ b/tests/repository_data/client/metadata/current/snapshot.json
@@ -3,7 +3,7 @@
   {
    "keyid": "5cf100388585b33a11b42e11bb008350c2afc508f9aff248a1dc49cc787c1eb7",
    "method": "RSASSA-PSS",
-   "sig": "61aeed88f8c804eeed4b39d7637591b3bf7337ce49f93eb1c85d4e2a477993d7de16e08dc595e39aa8806897186dc570ef6e59f87d66de84384c1753dd9da49e702a07db51a8200a7bcfbb4333f6a85be04ddbf71deb6fad152ab488904dd00776ad23bbb121f7eaa72641112312f3739c1e8bd62fedbf0e84ddd83ab19fdf7401ed7d444027059f797b86058275992ca562d58497dcf1ec6ea8dff504a8154aba21e00df44f3cd7bd30019e05ad98d7b6677e07444c238a9d773e1acbb6dd01bee1818486e9677a7b9d7ad2ef83b4b04453e39a939192f8953c83b109834231aa0354db963ebf551f2e2f295d8a22ccb9631fc2720d96768e6d2745cde180c6"
+   "sig": "2fe8b02bfc79fd504cc0ab564e0e4a5dd34039b4b93da692c0b630bf589e85735abdd549ecea2055e9cb1c29abc04432b891afe8f760fd97ecc77bbc26cef0d23af40a5cc7981d1a9734d241ecefc5077d310124f90e51f40932857a915966f487c121dd35686c50b033e006141c7b354b8d998391a0e357f39fc386aa75fb5edf8de4d0d552fd51f03d9c5470d5351ad24fe4e360406021966ae18c1e070b788afa81fb1ea5b9db33a4f89e54ed34420577bcf105a3a6f5c435afdfa2ea36a426e545a698ab112937799a40f52ae15ba38eff6272b7b7a7360e3d9803aa7b54d4ef59d952fd17637b4d1a61896dc97b0433080cd45fffe6c094775114c23581"
   }
  ],
  "signed": {
@@ -12,25 +12,31 @@
   "meta": {
    "root.json": {
     "hashes": {
-     "sha256": "5807d54bdaf21e6e43db392e50c37aa3843033cf2e91b9790f72caab13b377c8"
+     "sha256": "120f7296a53a3b7829976912485a6df4093e7912edbaa9b9d85a63b2ed449813"
     },
     "length": 3756
    },
+   "root.json.gz": {
+    "hashes": {
+     "sha256": "8bde832373ce3bad75ae0b3ff48d579b184375deb5b4649a390eb20204b7ba4f"
+    },
+    "length": 2054
+   },
    "targets.json": {
     "hashes": {
-     "sha256": "ccf4f1be1d6b75df2d2262de421fb340e306424d102162deaadbc06f1f486466"
+     "sha256": "1b54878e0f5cfffbe67b693f222e127e5c528b5749fe7ab11b44b13a72555566"
     },
-    "length": 2015
+    "length": 2014
    },
    "targets.json.gz": {
     "hashes": {
-     "sha256": "dfdba012f7e65ce5d51eccd898e89be74918bdcada7dbdedf633752fe12313ad"
+     "sha256": "d3b93d4753bbb5fcc118311094789c1dcf85ef624ec23f044338f310dc7feb03"
     },
-    "length": 1241
+    "length": 1237
    },
    "targets/role1.json": {
     "hashes": {
-     "sha256": "5d62165e705701edf194dbdea17d25ef624c6401d573832ac0f1ec5742c1b8f6"
+     "sha256": "0ea2c8457b0e069c58e58db55543bc7bceee02d61371548a1ccec7d724c50ad4"
     },
     "length": 974
    }
diff --git a/tests/repository_data/client/metadata/current/snapshot.json.gz b/tests/repository_data/client/metadata/current/snapshot.json.gz
new file mode 100644
index 0000000000..bfb371165e
Binary files /dev/null and b/tests/repository_data/client/metadata/current/snapshot.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/targets.json b/tests/repository_data/client/metadata/current/targets.json
index b6b75e9d7c..b1e493ae25 100644
--- a/tests/repository_data/client/metadata/current/targets.json
+++ b/tests/repository_data/client/metadata/current/targets.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a07d55ab2637afc97b2d2fff88001618b9d23ac4e16d049cffa18d59ae374c05",
    "method": "RSASSA-PSS",
-   "sig": "2ee65198d1f25e77e77c7d3e4027a23659257bb597ccb51199223272368f0a3bcedf77b8f7d1ab52ac8dd26443589e7f938f74669503da9006f704339a2fd820dc9cb8859abe7aab4f76c367fc9cc7963c623156fcb73c5b15cb0957f0f1d00cbde7f7c4cb999542b9709e545402a50960d5d3d79074e170abda55d2a7ee849994c4a648bc835d4940f3d84ed0e2adeee0fc9b70b038a2986dcfb0398ec1acd0f9e1ebed2c4d9dc481ae9725770da40a7d84ade415f44db0dc1ba329a9b8a96c1bb62a11c51f3f5e1c4b122b3091ff0c814bfc0ead8393f46f9c061202613fad7135a6adda121fabd7ffdc014a68e4b6fe61854a4a9aca546e84f0c7cbf2b4f5"
+   "sig": "1a7e4fe4fc7ad0d39f8585d6dcfdf2389a61adfe77ed245a7faa7dbf2bc8c0cab541ea8337fc0ed915f5811ab1a549044566b618b5289d934ba8d0d1b3468e9c92fbc2f9811d36c9d3d3b3d5dd0c015c27d45472dedb5f9880493439952a610677166e4c9e344f3394d7ebf613f74154a03d06caa8dbb42c2935cf4e2e23fc254de9ac50c2c14b01aee2c4eb6e1aa2600f23a3da6d948422afb5261c92e7b152da9d840771de9a1e8d3caecdb6d1bbaea44f1341b7dfc775ba1c673926972a3771ed6084d4185952866d1aad73a6d529726425545d87e2f017e52895dc40b5823247e8529743439494b822c6d9c8745a03a003db7560d9ee379a551de7193dcd"
   }
  ],
  "signed": {
@@ -35,7 +35,7 @@
   "targets": {
    "/file1.txt": {
     "custom": {
-     "file_permissions": "0664"
+     "file_permissions": "664"
     },
     "hashes": {
      "sha256": "65b8c67f51c993d898250f40aa57a317d854900b3a04895464313e48785440da"
diff --git a/tests/repository_data/client/metadata/current/targets.json.gz b/tests/repository_data/client/metadata/current/targets.json.gz
index 2105e11b10..cb9762e290 100644
Binary files a/tests/repository_data/client/metadata/current/targets.json.gz and b/tests/repository_data/client/metadata/current/targets.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/targets/role1.json b/tests/repository_data/client/metadata/current/targets/role1.json
index b81f5aa2f3..263d9895c5 100644
--- a/tests/repository_data/client/metadata/current/targets/role1.json
+++ b/tests/repository_data/client/metadata/current/targets/role1.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a404d46b042a2eb92f0cc4b28849f8e9107c9e185c45c8ece64a302626af805f",
    "method": "RSASSA-PSS",
-   "sig": "a215039e3df65e9fd71d70d236b06db02deacfc6bcef465f650fb9837b30b9a7bb17ebbcdcdceea7b5359d7569e894b4aeddb2cd97611c4c54784dec3c8859c004568b0b1e2fb55b7c9688752098df25b100fcb70a6c759c7a8f0bbdcb700322ab5fb3ed62e969d80076d2d49f725cd89f022225d95f22c9950f7a4047eae65c3a02b295cf96be973db756782542ca68280bf20118577f0ded06cfb5a147f5fdcac0e617329c592b363ab93d9168887d95ced021c8bfec12465db31461ad6b167adfdee46e3295eec7cf65c8b507db40d89371b5695d651d2367838b8c5f458a415c0c2481ef55956d6f6fc602916711c0a726b850aa4ca336abb8787e3329cd"
+   "sig": "31373a34981158c583f75387799cba7abe582d467b0d762231541338ab9d3e26d3ba916363485dcf626267c87536d023f4b1cb8c06d4643cf3eae3f4ce642a6123e27bd0789ea3ebb36e679afac0157316b17500666c377b5e685e7297e33ab2bd5fc83d751c5d3d319b61add3f162cbc2b6a3ec734df5e71638d4aa571c30d2ef35c88042b5015ddf087bb92205f8311c81a4bd7b05f65778431107d76df4fc00222f267bbf4f7f3b0697745652f5b921120fb77b0e81bd1d7547fd84553868db8b06c011daa67c37986138a542d48a6f620112d1a039ca97e98547f2fa5bfe6ddbb07228fb41d366615af4d52b77a899115a3696047eb6f7b503a86bafbb0e"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/client/metadata/current/timestamp.json b/tests/repository_data/client/metadata/current/timestamp.json
index 4ea1f060c4..802f2b0575 100644
--- a/tests/repository_data/client/metadata/current/timestamp.json
+++ b/tests/repository_data/client/metadata/current/timestamp.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a45544c2d4c368826d06e99b7702db9e7c10f74d628a9b7a46930b187f54daab",
    "method": "RSASSA-PSS",
-   "sig": "437468906e14033c509b403433b6afd97747a44b6efb8220775fafe799c428875f465233e135088849e352b3cb0909d6e7d22ae16de26a17fa1f7c40c246770c62a769282f0f7e8db6691c75da1eef34ef0e36beb6fc4b6015ce6a6e33c0de2fdee53b2e644a8ee09309c941612d2dc3654ec69b5359c42485cf7f5935138e4c7b455271699832409d481ef2910717e58a69d061a407d1dff102014dbf758a86de1fba8c3a1b0c18b1ef6a963b40dd5156ceaca21f138d3ce6910b8f16a3e9d2c8ff3649fbb865299b11719e9c3499ef92fb33f620eeb873507aa39270fdd97a1264eff5446dffbdc6aa5c94ee1e7863c76960f6fc95854e7406b61e7e0d7286"
+   "sig": "a4795eb3e5603b7ade11592ccf6d3a567d934b0b9ec9353447058b3af2b022afefa0536c6b2ac77668576ca6e4f2c7cdaf17a1d4664947d6cc995ff8bc181c00760bfdfebb30116e0987bcf7e93a28d849c0b3afcce30d02982b0340bdfb2b96fc11eee438b95e10dd826bfda7a6df5ba19909c22997ef24b7880672f0d1960e89262c9d2fa4d95893647c7e1a7afcf1cacd3d6a0ac8a29ae373d85e4ea531cd25f8a68997302608e0eb379e9ea466051b8ac724cb6bec06cdb619f65416859f6debae1ba3e9a8e3ce1d3cb379316a2a9f3f468b41a111dc6757fe62b889838c4daf0ccc923ed85cf9c8383184df6212548165053757ebc21b316486c41cbe0b"
   }
  ],
  "signed": {
@@ -12,9 +12,15 @@
   "meta": {
    "snapshot.json": {
     "hashes": {
-     "sha256": "0f2c174c1da7cd2fcd6a014f5ec0825bfddab586aa9224520f15be0397fa8e44"
+     "sha256": "dbce3738687c9ce6821e93abfc3ce7ac3a279a6da8f0942e6ec67b24df062513"
     },
-    "length": 1380
+    "length": 1531
+   },
+   "snapshot.json.gz": {
+    "hashes": {
+     "sha256": "6216eccdefe910e988d7bce8b69e1ebed471010c5ad98bcd886f36cd16b9ab43"
+    },
+    "length": 800
    }
   },
   "version": 1
diff --git a/tests/repository_data/client/metadata/current/timestamp.json.gz b/tests/repository_data/client/metadata/current/timestamp.json.gz
new file mode 100644
index 0000000000..24f1167149
Binary files /dev/null and b/tests/repository_data/client/metadata/current/timestamp.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/root.json b/tests/repository_data/client/metadata/previous/root.json
index 914c5b6641..f4c8ad4215 100644
--- a/tests/repository_data/client/metadata/previous/root.json
+++ b/tests/repository_data/client/metadata/previous/root.json
@@ -3,7 +3,7 @@
   {
    "keyid": "6986b667c736a3b37471e030cf4ce7aa6c7e0d530325e64c2660276b77be3754",
    "method": "RSASSA-PSS",
-   "sig": "434559983d8e535eb43f1acda08cc645a98fdcb0d9d42968e9dc8609ea83961c97dc1905581295594a41615d0bfaab09f6df12420b2181f8ffb5379fcf570ea0d0fd6a3b41e72abfb0b8b0070d54627ddac6273d6165bba5927d786478e9c2cd968ab10307874d1b9eb52c307b57da0c9f9c91c9a00ec85d1c0d4d75283cceb3567e2b45476ab381d6166fd6804d0e611504d1e894b324a591d4201be1423f19f1d6d4267742a8ae59a992b96da572b96f7d8e469ce3d63d41e95768cbe7fc242a30b7c09d2343f7acc74fa4d07901cd521312652dbd1ea493508d74850b8e75dd2da45a97d5a8a079ef4c1be26d4691b3282c732b428fa08db0ecf2e7973a53"
+   "sig": "a710ca79819bb01452e0a1091612bf1282644bdd7c10aa73d125ad99d7773fb8580d432d3e2b930954637c5177ea0a9322c8f64dde373df920cd3d31ffd7ea01362015a882754529314b9c870a532aa87fcb735f3f932bfebac3b4b2a286871e942f86a9a5deb4370c9f24f18a85aaa01c91fd67547c7fc8b21d7433bc28c8eda5223df2843b79a38cc84498267269f85d2422374852597b47ee1b58e336b8cbc401f4545d565914e475c4c9546ea6e45dcdcce3f049af7476d9db9cafbcb6400d1cd4e590d108f31fb6ff38f5a134b2f2b386207c0a217572461735f1e4a78107c6cd023a417ed721dcbb904fec375cca2572b159239930d99962d0ad4033a5"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/client/metadata/previous/root.json.gz b/tests/repository_data/client/metadata/previous/root.json.gz
new file mode 100644
index 0000000000..655ba429bd
Binary files /dev/null and b/tests/repository_data/client/metadata/previous/root.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/snapshot.json b/tests/repository_data/client/metadata/previous/snapshot.json
index f1dddeeddb..d528363e3c 100644
--- a/tests/repository_data/client/metadata/previous/snapshot.json
+++ b/tests/repository_data/client/metadata/previous/snapshot.json
@@ -3,7 +3,7 @@
   {
    "keyid": "5cf100388585b33a11b42e11bb008350c2afc508f9aff248a1dc49cc787c1eb7",
    "method": "RSASSA-PSS",
-   "sig": "61aeed88f8c804eeed4b39d7637591b3bf7337ce49f93eb1c85d4e2a477993d7de16e08dc595e39aa8806897186dc570ef6e59f87d66de84384c1753dd9da49e702a07db51a8200a7bcfbb4333f6a85be04ddbf71deb6fad152ab488904dd00776ad23bbb121f7eaa72641112312f3739c1e8bd62fedbf0e84ddd83ab19fdf7401ed7d444027059f797b86058275992ca562d58497dcf1ec6ea8dff504a8154aba21e00df44f3cd7bd30019e05ad98d7b6677e07444c238a9d773e1acbb6dd01bee1818486e9677a7b9d7ad2ef83b4b04453e39a939192f8953c83b109834231aa0354db963ebf551f2e2f295d8a22ccb9631fc2720d96768e6d2745cde180c6"
+   "sig": "2fe8b02bfc79fd504cc0ab564e0e4a5dd34039b4b93da692c0b630bf589e85735abdd549ecea2055e9cb1c29abc04432b891afe8f760fd97ecc77bbc26cef0d23af40a5cc7981d1a9734d241ecefc5077d310124f90e51f40932857a915966f487c121dd35686c50b033e006141c7b354b8d998391a0e357f39fc386aa75fb5edf8de4d0d552fd51f03d9c5470d5351ad24fe4e360406021966ae18c1e070b788afa81fb1ea5b9db33a4f89e54ed34420577bcf105a3a6f5c435afdfa2ea36a426e545a698ab112937799a40f52ae15ba38eff6272b7b7a7360e3d9803aa7b54d4ef59d952fd17637b4d1a61896dc97b0433080cd45fffe6c094775114c23581"
   }
  ],
  "signed": {
@@ -12,25 +12,31 @@
   "meta": {
    "root.json": {
     "hashes": {
-     "sha256": "5807d54bdaf21e6e43db392e50c37aa3843033cf2e91b9790f72caab13b377c8"
+     "sha256": "120f7296a53a3b7829976912485a6df4093e7912edbaa9b9d85a63b2ed449813"
     },
     "length": 3756
    },
+   "root.json.gz": {
+    "hashes": {
+     "sha256": "8bde832373ce3bad75ae0b3ff48d579b184375deb5b4649a390eb20204b7ba4f"
+    },
+    "length": 2054
+   },
    "targets.json": {
     "hashes": {
-     "sha256": "ccf4f1be1d6b75df2d2262de421fb340e306424d102162deaadbc06f1f486466"
+     "sha256": "1b54878e0f5cfffbe67b693f222e127e5c528b5749fe7ab11b44b13a72555566"
     },
-    "length": 2015
+    "length": 2014
    },
    "targets.json.gz": {
     "hashes": {
-     "sha256": "dfdba012f7e65ce5d51eccd898e89be74918bdcada7dbdedf633752fe12313ad"
+     "sha256": "d3b93d4753bbb5fcc118311094789c1dcf85ef624ec23f044338f310dc7feb03"
     },
-    "length": 1241
+    "length": 1237
    },
    "targets/role1.json": {
     "hashes": {
-     "sha256": "5d62165e705701edf194dbdea17d25ef624c6401d573832ac0f1ec5742c1b8f6"
+     "sha256": "0ea2c8457b0e069c58e58db55543bc7bceee02d61371548a1ccec7d724c50ad4"
     },
     "length": 974
    }
diff --git a/tests/repository_data/client/metadata/previous/snapshot.json.gz b/tests/repository_data/client/metadata/previous/snapshot.json.gz
new file mode 100644
index 0000000000..bfb371165e
Binary files /dev/null and b/tests/repository_data/client/metadata/previous/snapshot.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/targets.json b/tests/repository_data/client/metadata/previous/targets.json
index b6b75e9d7c..b1e493ae25 100644
--- a/tests/repository_data/client/metadata/previous/targets.json
+++ b/tests/repository_data/client/metadata/previous/targets.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a07d55ab2637afc97b2d2fff88001618b9d23ac4e16d049cffa18d59ae374c05",
    "method": "RSASSA-PSS",
-   "sig": "2ee65198d1f25e77e77c7d3e4027a23659257bb597ccb51199223272368f0a3bcedf77b8f7d1ab52ac8dd26443589e7f938f74669503da9006f704339a2fd820dc9cb8859abe7aab4f76c367fc9cc7963c623156fcb73c5b15cb0957f0f1d00cbde7f7c4cb999542b9709e545402a50960d5d3d79074e170abda55d2a7ee849994c4a648bc835d4940f3d84ed0e2adeee0fc9b70b038a2986dcfb0398ec1acd0f9e1ebed2c4d9dc481ae9725770da40a7d84ade415f44db0dc1ba329a9b8a96c1bb62a11c51f3f5e1c4b122b3091ff0c814bfc0ead8393f46f9c061202613fad7135a6adda121fabd7ffdc014a68e4b6fe61854a4a9aca546e84f0c7cbf2b4f5"
+   "sig": "1a7e4fe4fc7ad0d39f8585d6dcfdf2389a61adfe77ed245a7faa7dbf2bc8c0cab541ea8337fc0ed915f5811ab1a549044566b618b5289d934ba8d0d1b3468e9c92fbc2f9811d36c9d3d3b3d5dd0c015c27d45472dedb5f9880493439952a610677166e4c9e344f3394d7ebf613f74154a03d06caa8dbb42c2935cf4e2e23fc254de9ac50c2c14b01aee2c4eb6e1aa2600f23a3da6d948422afb5261c92e7b152da9d840771de9a1e8d3caecdb6d1bbaea44f1341b7dfc775ba1c673926972a3771ed6084d4185952866d1aad73a6d529726425545d87e2f017e52895dc40b5823247e8529743439494b822c6d9c8745a03a003db7560d9ee379a551de7193dcd"
   }
  ],
  "signed": {
@@ -35,7 +35,7 @@
   "targets": {
    "/file1.txt": {
     "custom": {
-     "file_permissions": "0664"
+     "file_permissions": "664"
     },
     "hashes": {
      "sha256": "65b8c67f51c993d898250f40aa57a317d854900b3a04895464313e48785440da"
diff --git a/tests/repository_data/client/metadata/previous/targets.json.gz b/tests/repository_data/client/metadata/previous/targets.json.gz
index 2105e11b10..cb9762e290 100644
Binary files a/tests/repository_data/client/metadata/previous/targets.json.gz and b/tests/repository_data/client/metadata/previous/targets.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/targets/role1.json b/tests/repository_data/client/metadata/previous/targets/role1.json
index b81f5aa2f3..263d9895c5 100644
--- a/tests/repository_data/client/metadata/previous/targets/role1.json
+++ b/tests/repository_data/client/metadata/previous/targets/role1.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a404d46b042a2eb92f0cc4b28849f8e9107c9e185c45c8ece64a302626af805f",
    "method": "RSASSA-PSS",
-   "sig": "a215039e3df65e9fd71d70d236b06db02deacfc6bcef465f650fb9837b30b9a7bb17ebbcdcdceea7b5359d7569e894b4aeddb2cd97611c4c54784dec3c8859c004568b0b1e2fb55b7c9688752098df25b100fcb70a6c759c7a8f0bbdcb700322ab5fb3ed62e969d80076d2d49f725cd89f022225d95f22c9950f7a4047eae65c3a02b295cf96be973db756782542ca68280bf20118577f0ded06cfb5a147f5fdcac0e617329c592b363ab93d9168887d95ced021c8bfec12465db31461ad6b167adfdee46e3295eec7cf65c8b507db40d89371b5695d651d2367838b8c5f458a415c0c2481ef55956d6f6fc602916711c0a726b850aa4ca336abb8787e3329cd"
+   "sig": "31373a34981158c583f75387799cba7abe582d467b0d762231541338ab9d3e26d3ba916363485dcf626267c87536d023f4b1cb8c06d4643cf3eae3f4ce642a6123e27bd0789ea3ebb36e679afac0157316b17500666c377b5e685e7297e33ab2bd5fc83d751c5d3d319b61add3f162cbc2b6a3ec734df5e71638d4aa571c30d2ef35c88042b5015ddf087bb92205f8311c81a4bd7b05f65778431107d76df4fc00222f267bbf4f7f3b0697745652f5b921120fb77b0e81bd1d7547fd84553868db8b06c011daa67c37986138a542d48a6f620112d1a039ca97e98547f2fa5bfe6ddbb07228fb41d366615af4d52b77a899115a3696047eb6f7b503a86bafbb0e"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/client/metadata/previous/timestamp.json b/tests/repository_data/client/metadata/previous/timestamp.json
index 4ea1f060c4..802f2b0575 100644
--- a/tests/repository_data/client/metadata/previous/timestamp.json
+++ b/tests/repository_data/client/metadata/previous/timestamp.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a45544c2d4c368826d06e99b7702db9e7c10f74d628a9b7a46930b187f54daab",
    "method": "RSASSA-PSS",
-   "sig": "437468906e14033c509b403433b6afd97747a44b6efb8220775fafe799c428875f465233e135088849e352b3cb0909d6e7d22ae16de26a17fa1f7c40c246770c62a769282f0f7e8db6691c75da1eef34ef0e36beb6fc4b6015ce6a6e33c0de2fdee53b2e644a8ee09309c941612d2dc3654ec69b5359c42485cf7f5935138e4c7b455271699832409d481ef2910717e58a69d061a407d1dff102014dbf758a86de1fba8c3a1b0c18b1ef6a963b40dd5156ceaca21f138d3ce6910b8f16a3e9d2c8ff3649fbb865299b11719e9c3499ef92fb33f620eeb873507aa39270fdd97a1264eff5446dffbdc6aa5c94ee1e7863c76960f6fc95854e7406b61e7e0d7286"
+   "sig": "a4795eb3e5603b7ade11592ccf6d3a567d934b0b9ec9353447058b3af2b022afefa0536c6b2ac77668576ca6e4f2c7cdaf17a1d4664947d6cc995ff8bc181c00760bfdfebb30116e0987bcf7e93a28d849c0b3afcce30d02982b0340bdfb2b96fc11eee438b95e10dd826bfda7a6df5ba19909c22997ef24b7880672f0d1960e89262c9d2fa4d95893647c7e1a7afcf1cacd3d6a0ac8a29ae373d85e4ea531cd25f8a68997302608e0eb379e9ea466051b8ac724cb6bec06cdb619f65416859f6debae1ba3e9a8e3ce1d3cb379316a2a9f3f468b41a111dc6757fe62b889838c4daf0ccc923ed85cf9c8383184df6212548165053757ebc21b316486c41cbe0b"
   }
  ],
  "signed": {
@@ -12,9 +12,15 @@
   "meta": {
    "snapshot.json": {
     "hashes": {
-     "sha256": "0f2c174c1da7cd2fcd6a014f5ec0825bfddab586aa9224520f15be0397fa8e44"
+     "sha256": "dbce3738687c9ce6821e93abfc3ce7ac3a279a6da8f0942e6ec67b24df062513"
     },
-    "length": 1380
+    "length": 1531
+   },
+   "snapshot.json.gz": {
+    "hashes": {
+     "sha256": "6216eccdefe910e988d7bce8b69e1ebed471010c5ad98bcd886f36cd16b9ab43"
+    },
+    "length": 800
    }
   },
   "version": 1
diff --git a/tests/repository_data/client/metadata/previous/timestamp.json.gz b/tests/repository_data/client/metadata/previous/timestamp.json.gz
new file mode 100644
index 0000000000..24f1167149
Binary files /dev/null and b/tests/repository_data/client/metadata/previous/timestamp.json.gz differ
diff --git a/tests/repository_data/generate.py b/tests/repository_data/generate.py
index 8e85a25c5f..bc1b12245f 100755
--- a/tests/repository_data/generate.py
+++ b/tests/repository_data/generate.py
@@ -135,9 +135,12 @@
 repository.timestamp.expiration = datetime.datetime(2030, 1, 1, 0, 0)
 repository.targets('role1').expiration = datetime.datetime(2030, 1, 1, 0, 0)
 
-# Compress the 'targets.json' role so that the unit tests have a pre-generated
-# example of compressed metadata.
+# Compress the top-level role metadata so that the unit tests have a
+# pre-generated example of compressed metadata.
+repository.root.compressions = ['gz']
 repository.targets.compressions = ['gz']
+repository.snapshot.compressions = ['gz']
+repository.timestamp.compressions = ['gz']
 
 # Create the actual metadata files, which are saved to 'metadata.staged'. 
 if not options.dry_run:
diff --git a/tests/repository_data/repository/metadata.staged/root.json b/tests/repository_data/repository/metadata.staged/root.json
index 914c5b6641..f4c8ad4215 100644
--- a/tests/repository_data/repository/metadata.staged/root.json
+++ b/tests/repository_data/repository/metadata.staged/root.json
@@ -3,7 +3,7 @@
   {
    "keyid": "6986b667c736a3b37471e030cf4ce7aa6c7e0d530325e64c2660276b77be3754",
    "method": "RSASSA-PSS",
-   "sig": "434559983d8e535eb43f1acda08cc645a98fdcb0d9d42968e9dc8609ea83961c97dc1905581295594a41615d0bfaab09f6df12420b2181f8ffb5379fcf570ea0d0fd6a3b41e72abfb0b8b0070d54627ddac6273d6165bba5927d786478e9c2cd968ab10307874d1b9eb52c307b57da0c9f9c91c9a00ec85d1c0d4d75283cceb3567e2b45476ab381d6166fd6804d0e611504d1e894b324a591d4201be1423f19f1d6d4267742a8ae59a992b96da572b96f7d8e469ce3d63d41e95768cbe7fc242a30b7c09d2343f7acc74fa4d07901cd521312652dbd1ea493508d74850b8e75dd2da45a97d5a8a079ef4c1be26d4691b3282c732b428fa08db0ecf2e7973a53"
+   "sig": "a710ca79819bb01452e0a1091612bf1282644bdd7c10aa73d125ad99d7773fb8580d432d3e2b930954637c5177ea0a9322c8f64dde373df920cd3d31ffd7ea01362015a882754529314b9c870a532aa87fcb735f3f932bfebac3b4b2a286871e942f86a9a5deb4370c9f24f18a85aaa01c91fd67547c7fc8b21d7433bc28c8eda5223df2843b79a38cc84498267269f85d2422374852597b47ee1b58e336b8cbc401f4545d565914e475c4c9546ea6e45dcdcce3f049af7476d9db9cafbcb6400d1cd4e590d108f31fb6ff38f5a134b2f2b386207c0a217572461735f1e4a78107c6cd023a417ed721dcbb904fec375cca2572b159239930d99962d0ad4033a5"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/repository/metadata.staged/root.json.gz b/tests/repository_data/repository/metadata.staged/root.json.gz
new file mode 100644
index 0000000000..655ba429bd
Binary files /dev/null and b/tests/repository_data/repository/metadata.staged/root.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json b/tests/repository_data/repository/metadata.staged/snapshot.json
index f1dddeeddb..d528363e3c 100644
--- a/tests/repository_data/repository/metadata.staged/snapshot.json
+++ b/tests/repository_data/repository/metadata.staged/snapshot.json
@@ -3,7 +3,7 @@
   {
    "keyid": "5cf100388585b33a11b42e11bb008350c2afc508f9aff248a1dc49cc787c1eb7",
    "method": "RSASSA-PSS",
-   "sig": "61aeed88f8c804eeed4b39d7637591b3bf7337ce49f93eb1c85d4e2a477993d7de16e08dc595e39aa8806897186dc570ef6e59f87d66de84384c1753dd9da49e702a07db51a8200a7bcfbb4333f6a85be04ddbf71deb6fad152ab488904dd00776ad23bbb121f7eaa72641112312f3739c1e8bd62fedbf0e84ddd83ab19fdf7401ed7d444027059f797b86058275992ca562d58497dcf1ec6ea8dff504a8154aba21e00df44f3cd7bd30019e05ad98d7b6677e07444c238a9d773e1acbb6dd01bee1818486e9677a7b9d7ad2ef83b4b04453e39a939192f8953c83b109834231aa0354db963ebf551f2e2f295d8a22ccb9631fc2720d96768e6d2745cde180c6"
+   "sig": "2fe8b02bfc79fd504cc0ab564e0e4a5dd34039b4b93da692c0b630bf589e85735abdd549ecea2055e9cb1c29abc04432b891afe8f760fd97ecc77bbc26cef0d23af40a5cc7981d1a9734d241ecefc5077d310124f90e51f40932857a915966f487c121dd35686c50b033e006141c7b354b8d998391a0e357f39fc386aa75fb5edf8de4d0d552fd51f03d9c5470d5351ad24fe4e360406021966ae18c1e070b788afa81fb1ea5b9db33a4f89e54ed34420577bcf105a3a6f5c435afdfa2ea36a426e545a698ab112937799a40f52ae15ba38eff6272b7b7a7360e3d9803aa7b54d4ef59d952fd17637b4d1a61896dc97b0433080cd45fffe6c094775114c23581"
   }
  ],
  "signed": {
@@ -12,25 +12,31 @@
   "meta": {
    "root.json": {
     "hashes": {
-     "sha256": "5807d54bdaf21e6e43db392e50c37aa3843033cf2e91b9790f72caab13b377c8"
+     "sha256": "120f7296a53a3b7829976912485a6df4093e7912edbaa9b9d85a63b2ed449813"
     },
     "length": 3756
    },
+   "root.json.gz": {
+    "hashes": {
+     "sha256": "8bde832373ce3bad75ae0b3ff48d579b184375deb5b4649a390eb20204b7ba4f"
+    },
+    "length": 2054
+   },
    "targets.json": {
     "hashes": {
-     "sha256": "ccf4f1be1d6b75df2d2262de421fb340e306424d102162deaadbc06f1f486466"
+     "sha256": "1b54878e0f5cfffbe67b693f222e127e5c528b5749fe7ab11b44b13a72555566"
     },
-    "length": 2015
+    "length": 2014
    },
    "targets.json.gz": {
     "hashes": {
-     "sha256": "dfdba012f7e65ce5d51eccd898e89be74918bdcada7dbdedf633752fe12313ad"
+     "sha256": "d3b93d4753bbb5fcc118311094789c1dcf85ef624ec23f044338f310dc7feb03"
     },
-    "length": 1241
+    "length": 1237
    },
    "targets/role1.json": {
     "hashes": {
-     "sha256": "5d62165e705701edf194dbdea17d25ef624c6401d573832ac0f1ec5742c1b8f6"
+     "sha256": "0ea2c8457b0e069c58e58db55543bc7bceee02d61371548a1ccec7d724c50ad4"
     },
     "length": 974
    }
diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json.gz b/tests/repository_data/repository/metadata.staged/snapshot.json.gz
new file mode 100644
index 0000000000..bfb371165e
Binary files /dev/null and b/tests/repository_data/repository/metadata.staged/snapshot.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/targets.json b/tests/repository_data/repository/metadata.staged/targets.json
index b6b75e9d7c..b1e493ae25 100644
--- a/tests/repository_data/repository/metadata.staged/targets.json
+++ b/tests/repository_data/repository/metadata.staged/targets.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a07d55ab2637afc97b2d2fff88001618b9d23ac4e16d049cffa18d59ae374c05",
    "method": "RSASSA-PSS",
-   "sig": "2ee65198d1f25e77e77c7d3e4027a23659257bb597ccb51199223272368f0a3bcedf77b8f7d1ab52ac8dd26443589e7f938f74669503da9006f704339a2fd820dc9cb8859abe7aab4f76c367fc9cc7963c623156fcb73c5b15cb0957f0f1d00cbde7f7c4cb999542b9709e545402a50960d5d3d79074e170abda55d2a7ee849994c4a648bc835d4940f3d84ed0e2adeee0fc9b70b038a2986dcfb0398ec1acd0f9e1ebed2c4d9dc481ae9725770da40a7d84ade415f44db0dc1ba329a9b8a96c1bb62a11c51f3f5e1c4b122b3091ff0c814bfc0ead8393f46f9c061202613fad7135a6adda121fabd7ffdc014a68e4b6fe61854a4a9aca546e84f0c7cbf2b4f5"
+   "sig": "1a7e4fe4fc7ad0d39f8585d6dcfdf2389a61adfe77ed245a7faa7dbf2bc8c0cab541ea8337fc0ed915f5811ab1a549044566b618b5289d934ba8d0d1b3468e9c92fbc2f9811d36c9d3d3b3d5dd0c015c27d45472dedb5f9880493439952a610677166e4c9e344f3394d7ebf613f74154a03d06caa8dbb42c2935cf4e2e23fc254de9ac50c2c14b01aee2c4eb6e1aa2600f23a3da6d948422afb5261c92e7b152da9d840771de9a1e8d3caecdb6d1bbaea44f1341b7dfc775ba1c673926972a3771ed6084d4185952866d1aad73a6d529726425545d87e2f017e52895dc40b5823247e8529743439494b822c6d9c8745a03a003db7560d9ee379a551de7193dcd"
   }
  ],
  "signed": {
@@ -35,7 +35,7 @@
   "targets": {
    "/file1.txt": {
     "custom": {
-     "file_permissions": "0664"
+     "file_permissions": "664"
     },
     "hashes": {
      "sha256": "65b8c67f51c993d898250f40aa57a317d854900b3a04895464313e48785440da"
diff --git a/tests/repository_data/repository/metadata.staged/targets.json.gz b/tests/repository_data/repository/metadata.staged/targets.json.gz
index 2105e11b10..cb9762e290 100644
Binary files a/tests/repository_data/repository/metadata.staged/targets.json.gz and b/tests/repository_data/repository/metadata.staged/targets.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/targets/role1.json b/tests/repository_data/repository/metadata.staged/targets/role1.json
index b81f5aa2f3..263d9895c5 100644
--- a/tests/repository_data/repository/metadata.staged/targets/role1.json
+++ b/tests/repository_data/repository/metadata.staged/targets/role1.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a404d46b042a2eb92f0cc4b28849f8e9107c9e185c45c8ece64a302626af805f",
    "method": "RSASSA-PSS",
-   "sig": "a215039e3df65e9fd71d70d236b06db02deacfc6bcef465f650fb9837b30b9a7bb17ebbcdcdceea7b5359d7569e894b4aeddb2cd97611c4c54784dec3c8859c004568b0b1e2fb55b7c9688752098df25b100fcb70a6c759c7a8f0bbdcb700322ab5fb3ed62e969d80076d2d49f725cd89f022225d95f22c9950f7a4047eae65c3a02b295cf96be973db756782542ca68280bf20118577f0ded06cfb5a147f5fdcac0e617329c592b363ab93d9168887d95ced021c8bfec12465db31461ad6b167adfdee46e3295eec7cf65c8b507db40d89371b5695d651d2367838b8c5f458a415c0c2481ef55956d6f6fc602916711c0a726b850aa4ca336abb8787e3329cd"
+   "sig": "31373a34981158c583f75387799cba7abe582d467b0d762231541338ab9d3e26d3ba916363485dcf626267c87536d023f4b1cb8c06d4643cf3eae3f4ce642a6123e27bd0789ea3ebb36e679afac0157316b17500666c377b5e685e7297e33ab2bd5fc83d751c5d3d319b61add3f162cbc2b6a3ec734df5e71638d4aa571c30d2ef35c88042b5015ddf087bb92205f8311c81a4bd7b05f65778431107d76df4fc00222f267bbf4f7f3b0697745652f5b921120fb77b0e81bd1d7547fd84553868db8b06c011daa67c37986138a542d48a6f620112d1a039ca97e98547f2fa5bfe6ddbb07228fb41d366615af4d52b77a899115a3696047eb6f7b503a86bafbb0e"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json b/tests/repository_data/repository/metadata.staged/timestamp.json
index 4ea1f060c4..802f2b0575 100644
--- a/tests/repository_data/repository/metadata.staged/timestamp.json
+++ b/tests/repository_data/repository/metadata.staged/timestamp.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a45544c2d4c368826d06e99b7702db9e7c10f74d628a9b7a46930b187f54daab",
    "method": "RSASSA-PSS",
-   "sig": "437468906e14033c509b403433b6afd97747a44b6efb8220775fafe799c428875f465233e135088849e352b3cb0909d6e7d22ae16de26a17fa1f7c40c246770c62a769282f0f7e8db6691c75da1eef34ef0e36beb6fc4b6015ce6a6e33c0de2fdee53b2e644a8ee09309c941612d2dc3654ec69b5359c42485cf7f5935138e4c7b455271699832409d481ef2910717e58a69d061a407d1dff102014dbf758a86de1fba8c3a1b0c18b1ef6a963b40dd5156ceaca21f138d3ce6910b8f16a3e9d2c8ff3649fbb865299b11719e9c3499ef92fb33f620eeb873507aa39270fdd97a1264eff5446dffbdc6aa5c94ee1e7863c76960f6fc95854e7406b61e7e0d7286"
+   "sig": "a4795eb3e5603b7ade11592ccf6d3a567d934b0b9ec9353447058b3af2b022afefa0536c6b2ac77668576ca6e4f2c7cdaf17a1d4664947d6cc995ff8bc181c00760bfdfebb30116e0987bcf7e93a28d849c0b3afcce30d02982b0340bdfb2b96fc11eee438b95e10dd826bfda7a6df5ba19909c22997ef24b7880672f0d1960e89262c9d2fa4d95893647c7e1a7afcf1cacd3d6a0ac8a29ae373d85e4ea531cd25f8a68997302608e0eb379e9ea466051b8ac724cb6bec06cdb619f65416859f6debae1ba3e9a8e3ce1d3cb379316a2a9f3f468b41a111dc6757fe62b889838c4daf0ccc923ed85cf9c8383184df6212548165053757ebc21b316486c41cbe0b"
   }
  ],
  "signed": {
@@ -12,9 +12,15 @@
   "meta": {
    "snapshot.json": {
     "hashes": {
-     "sha256": "0f2c174c1da7cd2fcd6a014f5ec0825bfddab586aa9224520f15be0397fa8e44"
+     "sha256": "dbce3738687c9ce6821e93abfc3ce7ac3a279a6da8f0942e6ec67b24df062513"
     },
-    "length": 1380
+    "length": 1531
+   },
+   "snapshot.json.gz": {
+    "hashes": {
+     "sha256": "6216eccdefe910e988d7bce8b69e1ebed471010c5ad98bcd886f36cd16b9ab43"
+    },
+    "length": 800
    }
   },
   "version": 1
diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json.gz b/tests/repository_data/repository/metadata.staged/timestamp.json.gz
new file mode 100644
index 0000000000..24f1167149
Binary files /dev/null and b/tests/repository_data/repository/metadata.staged/timestamp.json.gz differ
diff --git a/tests/repository_data/repository/metadata/root.json b/tests/repository_data/repository/metadata/root.json
index 914c5b6641..f4c8ad4215 100644
--- a/tests/repository_data/repository/metadata/root.json
+++ b/tests/repository_data/repository/metadata/root.json
@@ -3,7 +3,7 @@
   {
    "keyid": "6986b667c736a3b37471e030cf4ce7aa6c7e0d530325e64c2660276b77be3754",
    "method": "RSASSA-PSS",
-   "sig": "434559983d8e535eb43f1acda08cc645a98fdcb0d9d42968e9dc8609ea83961c97dc1905581295594a41615d0bfaab09f6df12420b2181f8ffb5379fcf570ea0d0fd6a3b41e72abfb0b8b0070d54627ddac6273d6165bba5927d786478e9c2cd968ab10307874d1b9eb52c307b57da0c9f9c91c9a00ec85d1c0d4d75283cceb3567e2b45476ab381d6166fd6804d0e611504d1e894b324a591d4201be1423f19f1d6d4267742a8ae59a992b96da572b96f7d8e469ce3d63d41e95768cbe7fc242a30b7c09d2343f7acc74fa4d07901cd521312652dbd1ea493508d74850b8e75dd2da45a97d5a8a079ef4c1be26d4691b3282c732b428fa08db0ecf2e7973a53"
+   "sig": "a710ca79819bb01452e0a1091612bf1282644bdd7c10aa73d125ad99d7773fb8580d432d3e2b930954637c5177ea0a9322c8f64dde373df920cd3d31ffd7ea01362015a882754529314b9c870a532aa87fcb735f3f932bfebac3b4b2a286871e942f86a9a5deb4370c9f24f18a85aaa01c91fd67547c7fc8b21d7433bc28c8eda5223df2843b79a38cc84498267269f85d2422374852597b47ee1b58e336b8cbc401f4545d565914e475c4c9546ea6e45dcdcce3f049af7476d9db9cafbcb6400d1cd4e590d108f31fb6ff38f5a134b2f2b386207c0a217572461735f1e4a78107c6cd023a417ed721dcbb904fec375cca2572b159239930d99962d0ad4033a5"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/repository/metadata/root.json.gz b/tests/repository_data/repository/metadata/root.json.gz
new file mode 100644
index 0000000000..655ba429bd
Binary files /dev/null and b/tests/repository_data/repository/metadata/root.json.gz differ
diff --git a/tests/repository_data/repository/metadata/snapshot.json b/tests/repository_data/repository/metadata/snapshot.json
index f1dddeeddb..d528363e3c 100644
--- a/tests/repository_data/repository/metadata/snapshot.json
+++ b/tests/repository_data/repository/metadata/snapshot.json
@@ -3,7 +3,7 @@
   {
    "keyid": "5cf100388585b33a11b42e11bb008350c2afc508f9aff248a1dc49cc787c1eb7",
    "method": "RSASSA-PSS",
-   "sig": "61aeed88f8c804eeed4b39d7637591b3bf7337ce49f93eb1c85d4e2a477993d7de16e08dc595e39aa8806897186dc570ef6e59f87d66de84384c1753dd9da49e702a07db51a8200a7bcfbb4333f6a85be04ddbf71deb6fad152ab488904dd00776ad23bbb121f7eaa72641112312f3739c1e8bd62fedbf0e84ddd83ab19fdf7401ed7d444027059f797b86058275992ca562d58497dcf1ec6ea8dff504a8154aba21e00df44f3cd7bd30019e05ad98d7b6677e07444c238a9d773e1acbb6dd01bee1818486e9677a7b9d7ad2ef83b4b04453e39a939192f8953c83b109834231aa0354db963ebf551f2e2f295d8a22ccb9631fc2720d96768e6d2745cde180c6"
+   "sig": "2fe8b02bfc79fd504cc0ab564e0e4a5dd34039b4b93da692c0b630bf589e85735abdd549ecea2055e9cb1c29abc04432b891afe8f760fd97ecc77bbc26cef0d23af40a5cc7981d1a9734d241ecefc5077d310124f90e51f40932857a915966f487c121dd35686c50b033e006141c7b354b8d998391a0e357f39fc386aa75fb5edf8de4d0d552fd51f03d9c5470d5351ad24fe4e360406021966ae18c1e070b788afa81fb1ea5b9db33a4f89e54ed34420577bcf105a3a6f5c435afdfa2ea36a426e545a698ab112937799a40f52ae15ba38eff6272b7b7a7360e3d9803aa7b54d4ef59d952fd17637b4d1a61896dc97b0433080cd45fffe6c094775114c23581"
   }
  ],
  "signed": {
@@ -12,25 +12,31 @@
   "meta": {
    "root.json": {
     "hashes": {
-     "sha256": "5807d54bdaf21e6e43db392e50c37aa3843033cf2e91b9790f72caab13b377c8"
+     "sha256": "120f7296a53a3b7829976912485a6df4093e7912edbaa9b9d85a63b2ed449813"
     },
     "length": 3756
    },
+   "root.json.gz": {
+    "hashes": {
+     "sha256": "8bde832373ce3bad75ae0b3ff48d579b184375deb5b4649a390eb20204b7ba4f"
+    },
+    "length": 2054
+   },
    "targets.json": {
     "hashes": {
-     "sha256": "ccf4f1be1d6b75df2d2262de421fb340e306424d102162deaadbc06f1f486466"
+     "sha256": "1b54878e0f5cfffbe67b693f222e127e5c528b5749fe7ab11b44b13a72555566"
     },
-    "length": 2015
+    "length": 2014
    },
    "targets.json.gz": {
     "hashes": {
-     "sha256": "dfdba012f7e65ce5d51eccd898e89be74918bdcada7dbdedf633752fe12313ad"
+     "sha256": "d3b93d4753bbb5fcc118311094789c1dcf85ef624ec23f044338f310dc7feb03"
     },
-    "length": 1241
+    "length": 1237
    },
    "targets/role1.json": {
     "hashes": {
-     "sha256": "5d62165e705701edf194dbdea17d25ef624c6401d573832ac0f1ec5742c1b8f6"
+     "sha256": "0ea2c8457b0e069c58e58db55543bc7bceee02d61371548a1ccec7d724c50ad4"
     },
     "length": 974
    }
diff --git a/tests/repository_data/repository/metadata/snapshot.json.gz b/tests/repository_data/repository/metadata/snapshot.json.gz
new file mode 100644
index 0000000000..bfb371165e
Binary files /dev/null and b/tests/repository_data/repository/metadata/snapshot.json.gz differ
diff --git a/tests/repository_data/repository/metadata/targets.json b/tests/repository_data/repository/metadata/targets.json
index b6b75e9d7c..b1e493ae25 100644
--- a/tests/repository_data/repository/metadata/targets.json
+++ b/tests/repository_data/repository/metadata/targets.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a07d55ab2637afc97b2d2fff88001618b9d23ac4e16d049cffa18d59ae374c05",
    "method": "RSASSA-PSS",
-   "sig": "2ee65198d1f25e77e77c7d3e4027a23659257bb597ccb51199223272368f0a3bcedf77b8f7d1ab52ac8dd26443589e7f938f74669503da9006f704339a2fd820dc9cb8859abe7aab4f76c367fc9cc7963c623156fcb73c5b15cb0957f0f1d00cbde7f7c4cb999542b9709e545402a50960d5d3d79074e170abda55d2a7ee849994c4a648bc835d4940f3d84ed0e2adeee0fc9b70b038a2986dcfb0398ec1acd0f9e1ebed2c4d9dc481ae9725770da40a7d84ade415f44db0dc1ba329a9b8a96c1bb62a11c51f3f5e1c4b122b3091ff0c814bfc0ead8393f46f9c061202613fad7135a6adda121fabd7ffdc014a68e4b6fe61854a4a9aca546e84f0c7cbf2b4f5"
+   "sig": "1a7e4fe4fc7ad0d39f8585d6dcfdf2389a61adfe77ed245a7faa7dbf2bc8c0cab541ea8337fc0ed915f5811ab1a549044566b618b5289d934ba8d0d1b3468e9c92fbc2f9811d36c9d3d3b3d5dd0c015c27d45472dedb5f9880493439952a610677166e4c9e344f3394d7ebf613f74154a03d06caa8dbb42c2935cf4e2e23fc254de9ac50c2c14b01aee2c4eb6e1aa2600f23a3da6d948422afb5261c92e7b152da9d840771de9a1e8d3caecdb6d1bbaea44f1341b7dfc775ba1c673926972a3771ed6084d4185952866d1aad73a6d529726425545d87e2f017e52895dc40b5823247e8529743439494b822c6d9c8745a03a003db7560d9ee379a551de7193dcd"
   }
  ],
  "signed": {
@@ -35,7 +35,7 @@
   "targets": {
    "/file1.txt": {
     "custom": {
-     "file_permissions": "0664"
+     "file_permissions": "664"
     },
     "hashes": {
      "sha256": "65b8c67f51c993d898250f40aa57a317d854900b3a04895464313e48785440da"
diff --git a/tests/repository_data/repository/metadata/targets.json.gz b/tests/repository_data/repository/metadata/targets.json.gz
index 2105e11b10..cb9762e290 100644
Binary files a/tests/repository_data/repository/metadata/targets.json.gz and b/tests/repository_data/repository/metadata/targets.json.gz differ
diff --git a/tests/repository_data/repository/metadata/targets/role1.json b/tests/repository_data/repository/metadata/targets/role1.json
index b81f5aa2f3..263d9895c5 100644
--- a/tests/repository_data/repository/metadata/targets/role1.json
+++ b/tests/repository_data/repository/metadata/targets/role1.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a404d46b042a2eb92f0cc4b28849f8e9107c9e185c45c8ece64a302626af805f",
    "method": "RSASSA-PSS",
-   "sig": "a215039e3df65e9fd71d70d236b06db02deacfc6bcef465f650fb9837b30b9a7bb17ebbcdcdceea7b5359d7569e894b4aeddb2cd97611c4c54784dec3c8859c004568b0b1e2fb55b7c9688752098df25b100fcb70a6c759c7a8f0bbdcb700322ab5fb3ed62e969d80076d2d49f725cd89f022225d95f22c9950f7a4047eae65c3a02b295cf96be973db756782542ca68280bf20118577f0ded06cfb5a147f5fdcac0e617329c592b363ab93d9168887d95ced021c8bfec12465db31461ad6b167adfdee46e3295eec7cf65c8b507db40d89371b5695d651d2367838b8c5f458a415c0c2481ef55956d6f6fc602916711c0a726b850aa4ca336abb8787e3329cd"
+   "sig": "31373a34981158c583f75387799cba7abe582d467b0d762231541338ab9d3e26d3ba916363485dcf626267c87536d023f4b1cb8c06d4643cf3eae3f4ce642a6123e27bd0789ea3ebb36e679afac0157316b17500666c377b5e685e7297e33ab2bd5fc83d751c5d3d319b61add3f162cbc2b6a3ec734df5e71638d4aa571c30d2ef35c88042b5015ddf087bb92205f8311c81a4bd7b05f65778431107d76df4fc00222f267bbf4f7f3b0697745652f5b921120fb77b0e81bd1d7547fd84553868db8b06c011daa67c37986138a542d48a6f620112d1a039ca97e98547f2fa5bfe6ddbb07228fb41d366615af4d52b77a899115a3696047eb6f7b503a86bafbb0e"
   }
  ],
  "signed": {
diff --git a/tests/repository_data/repository/metadata/timestamp.json b/tests/repository_data/repository/metadata/timestamp.json
index 4ea1f060c4..802f2b0575 100644
--- a/tests/repository_data/repository/metadata/timestamp.json
+++ b/tests/repository_data/repository/metadata/timestamp.json
@@ -3,7 +3,7 @@
   {
    "keyid": "a45544c2d4c368826d06e99b7702db9e7c10f74d628a9b7a46930b187f54daab",
    "method": "RSASSA-PSS",
-   "sig": "437468906e14033c509b403433b6afd97747a44b6efb8220775fafe799c428875f465233e135088849e352b3cb0909d6e7d22ae16de26a17fa1f7c40c246770c62a769282f0f7e8db6691c75da1eef34ef0e36beb6fc4b6015ce6a6e33c0de2fdee53b2e644a8ee09309c941612d2dc3654ec69b5359c42485cf7f5935138e4c7b455271699832409d481ef2910717e58a69d061a407d1dff102014dbf758a86de1fba8c3a1b0c18b1ef6a963b40dd5156ceaca21f138d3ce6910b8f16a3e9d2c8ff3649fbb865299b11719e9c3499ef92fb33f620eeb873507aa39270fdd97a1264eff5446dffbdc6aa5c94ee1e7863c76960f6fc95854e7406b61e7e0d7286"
+   "sig": "a4795eb3e5603b7ade11592ccf6d3a567d934b0b9ec9353447058b3af2b022afefa0536c6b2ac77668576ca6e4f2c7cdaf17a1d4664947d6cc995ff8bc181c00760bfdfebb30116e0987bcf7e93a28d849c0b3afcce30d02982b0340bdfb2b96fc11eee438b95e10dd826bfda7a6df5ba19909c22997ef24b7880672f0d1960e89262c9d2fa4d95893647c7e1a7afcf1cacd3d6a0ac8a29ae373d85e4ea531cd25f8a68997302608e0eb379e9ea466051b8ac724cb6bec06cdb619f65416859f6debae1ba3e9a8e3ce1d3cb379316a2a9f3f468b41a111dc6757fe62b889838c4daf0ccc923ed85cf9c8383184df6212548165053757ebc21b316486c41cbe0b"
   }
  ],
  "signed": {
@@ -12,9 +12,15 @@
   "meta": {
    "snapshot.json": {
     "hashes": {
-     "sha256": "0f2c174c1da7cd2fcd6a014f5ec0825bfddab586aa9224520f15be0397fa8e44"
+     "sha256": "dbce3738687c9ce6821e93abfc3ce7ac3a279a6da8f0942e6ec67b24df062513"
     },
-    "length": 1380
+    "length": 1531
+   },
+   "snapshot.json.gz": {
+    "hashes": {
+     "sha256": "6216eccdefe910e988d7bce8b69e1ebed471010c5ad98bcd886f36cd16b9ab43"
+    },
+    "length": 800
    }
   },
   "version": 1
diff --git a/tests/repository_data/repository/metadata/timestamp.json.gz b/tests/repository_data/repository/metadata/timestamp.json.gz
new file mode 100644
index 0000000000..24f1167149
Binary files /dev/null and b/tests/repository_data/repository/metadata/timestamp.json.gz differ
diff --git a/tests/test_download.py b/tests/test_download.py
index d55658d6a9..ba77449847 100755
--- a/tests/test_download.py
+++ b/tests/test_download.py
@@ -237,6 +237,12 @@ def test_https_connection(self):
 
 
 
+  def test__get_content_length(self):
+    content_length = \
+      tuf.download._get_content_length({'bad_connection_object': 8})
+    self.assertEqual(content_length, None)
+
+
 # Run unit test.
 if __name__ == '__main__':
   unittest.main()
diff --git a/tests/test_repository_lib.py b/tests/test_repository_lib.py
index 0dad03b006..557319b3ec 100755
--- a/tests/test_repository_lib.py
+++ b/tests/test_repository_lib.py
@@ -493,7 +493,14 @@ def test_generate_targets_metadata(self):
                                          version, expiration_date, delegations,
                                          False)
     self.assertTrue(tuf.formats.TARGETS_SCHEMA.matches(targets_metadata))
-    
+   
+    # Valid arguments with 'delegations' set to None.
+    targets_metadata = \
+      repo_lib.generate_targets_metadata(targets_directory, target_files,
+                                         version, expiration_date, None,
+                                         False)
+    self.assertTrue(tuf.formats.TARGETS_SCHEMA.matches(targets_metadata))
+
     # Verify that 'digest.filename' file is saved to 'targets_directory' if
     # the 'write_consistent_targets' argument is True.
     list_targets_directory = os.listdir(targets_directory)
@@ -529,11 +536,13 @@ def test_generate_targets_metadata(self):
                       targets_directory, target_files, version, expiration_date,
                       delegations, 3)  
 
+    # Test non-existent target file.
+    bad_target_file = \
+      {'non-existent.txt': {'file_permission': file_permissions}}
 
-    # Test invalid 'target_files' argument.
     self.assertRaises(tuf.Error, repo_lib.generate_targets_metadata,
-                      targets_directory, ['nonexistent_file.txt'], version,
-                      expiration_date)  
+                      targets_directory, bad_target_file, version,
+                      expiration_date)
 
 
 
diff --git a/tests/test_repository_tool.py b/tests/test_repository_tool.py
index 6c9622e85d..3bd70ec30a 100755
--- a/tests/test_repository_tool.py
+++ b/tests/test_repository_tool.py
@@ -333,8 +333,9 @@ def test_get_filepaths_in_directory(self):
     # Verify the expected filenames.  get_filepaths_in_directory() returns
     # a list of absolute paths.
     metadata_files = repo.get_filepaths_in_directory(metadata_directory) 
-    expected_files = ['root.json', 'targets.json', 'targets.json.gz',
-                      'snapshot.json', 'timestamp.json']
+    expected_files = ['root.json', 'root.json.gz', 'targets.json',
+                      'targets.json.gz', 'snapshot.json', 'snapshot.json.gz',
+                      'timestamp.json', 'timestamp.json.gz']
     basenames = [] 
     for filepath in metadata_files:
       basenames.append(os.path.basename(filepath))
diff --git a/tests/test_updater.py b/tests/test_updater.py
index 3c75837f52..1e2de0ef50 100755
--- a/tests/test_updater.py
+++ b/tests/test_updater.py
@@ -722,7 +722,15 @@ def test_4_refresh(self):
     # First verify that an expired root metadata is updated.
     expired_date = '1960-01-01T12:00:00Z' 
     self.repository_updater.metadata['current']['root']['expires'] = expired_date
-    self.repository_updater.refresh() 
+    self.repository_updater.refresh()
+
+    # Second, verify that expired root metadata is not updated if
+    # 'unsafely_update_root_if_necessary' is explictly set to 'False'.
+    expired_date = '1960-01-01T12:00:00Z' 
+    self.repository_updater.metadata['current']['root']['expires'] = expired_date
+    self.assertRaises(tuf.ExpiredMetadataError,
+                      self.repository_updater.refresh,
+                      unsafely_update_root_if_necessary=False)
 
     repository = repo_tool.load_repository(self.repository_directory)
     target3 = os.path.join(self.repository_directory, 'targets', 'file3.txt')
diff --git a/tuf/download.py b/tuf/download.py
index 1a59849f36..d3b5df9928 100755
--- a/tuf/download.py
+++ b/tuf/download.py
@@ -44,10 +44,10 @@
 # 'ssl.match_hostname' was added in Python 3.2.  The vendored version is needed
 # for Python 2.6 and 2.7.
 try:
-    from ssl import match_hostname, CertificateError
+  from ssl import match_hostname, CertificateError
 
-except ImportError:
-    from tuf._vendor.ssl_match_hostname import match_hostname, CertificateError
+except ImportError: # pragma: no cover
+  from tuf._vendor.ssl_match_hostname import match_hostname, CertificateError
 
 # See 'log.py' to learn how logging is handled in TUF.
 logger = logging.getLogger('tuf.download')