diff --git a/context/context.go b/context/context.go
index 51667119..00ecbb86 100644
--- a/context/context.go
+++ b/context/context.go
@@ -224,10 +224,8 @@ func (context *AptlyContext) newDownloader(progress aptly.Progress) aptly.Downlo
 	maxTries := context.config().DownloadRetries + 1
 	maxTriesFlag := context.flags.Lookup("max-tries")
 	if maxTriesFlag != nil {
-		maxTriesFlagValue := maxTriesFlag.Value.Get().(int)
-		if maxTriesFlagValue > maxTries {
-			maxTries = maxTriesFlagValue
-		}
+		// If flag is defined prefer it to global setting
+		maxTries = maxTriesFlag.Value.Get().(int)
 	}
 	return http.NewDownloader(downloadLimit*1024, maxTries, progress)
 }
diff --git a/http/download.go b/http/download.go
index a6fe46b7..24be26ff 100644
--- a/http/download.go
+++ b/http/download.go
@@ -174,6 +174,7 @@ func (downloader *downloaderImpl) DownloadWithChecksum(ctx context.Context, url
 
 	if downloader.progress != nil {
 		downloader.progress.Printf("Downloading %s...\n", url)
+		defer downloader.progress.Flush()
 	}
 	req, err := downloader.newRequest(ctx, "GET", url)
 
diff --git a/system/api_lib.py b/system/api_lib.py
index aada2f64..d6aaf97c 100644
--- a/system/api_lib.py
+++ b/system/api_lib.py
@@ -47,7 +47,14 @@ class APITest(BaseTest):
             kwargs["headers"]["Content-Type"] = "application/json"
         return requests.post("http://%s%s" % (self.base_url, uri), *args, **kwargs)
 
+    def _ensure_async(self, kwargs):
+        # Make sure we run this as an async task
+        params = kwargs.get('params', {})
+        params.setdefault('_async', True)
+        kwargs['params'] = params
+
     def post_task(self, uri, *args, **kwargs):
+        self._ensure_async(kwargs)
         resp = self.post(uri, *args, **kwargs)
         if resp.status_code != 202:
             return resp
@@ -67,6 +74,7 @@ class APITest(BaseTest):
         return requests.put("http://%s%s" % (self.base_url, uri), *args, **kwargs)
 
     def put_task(self, uri, *args, **kwargs):
+        self._ensure_async(kwargs)
         resp = self.put(uri, *args, **kwargs)
         if resp.status_code != 202:
             return resp
@@ -86,6 +94,7 @@ class APITest(BaseTest):
         return requests.delete("http://%s%s" % (self.base_url, uri), *args, **kwargs)
 
     def delete_task(self, uri, *args, **kwargs):
+        self._ensure_async(kwargs)
         resp = self.delete(uri, *args, **kwargs)
         if resp.status_code != 202:
             return resp
diff --git a/system/lib.py b/system/lib.py
index 1d4229c8..97eb7519 100644
--- a/system/lib.py
+++ b/system/lib.py
@@ -78,11 +78,31 @@ class GPGFinder(object):
         return None
 
 
+class DotFinder(object):
+    """
+    dot binary discovery.
+    """
+
+    def __init__(self):
+        self.dot = self.find_dot(["dot"])
+
+    def find_dot(self, executables):
+        for executable in executables:
+            try:
+                subprocess.check_output([executable])
+                return executable
+            except Exception:
+                pass
+
+        return None
+
+
 class BaseTest(object):
     """
     Base class for all tests.
     """
 
+    skipTest = False
     longTest = False
     fixturePool = False
     fixturePoolCopy = False
@@ -92,6 +112,7 @@ class BaseTest(object):
     requiresFTP = False
     requiresGPG1 = False
     requiresGPG2 = False
+    requiresDot = False
 
     expectedCode = 0
     configFile = {
@@ -128,11 +149,15 @@ class BaseTest(object):
     captureResults = False
 
     gpgFinder = GPGFinder()
+    dotFinder = DotFinder()
 
     def test(self):
         self.prepare()
-        self.run()
-        self.check()
+        try:
+            self.run()
+            self.check()
+        finally:
+            self.teardown()
 
     def prepare_remove_all(self):
         if os.path.exists(os.path.join(os.environ["HOME"], ".aptly")):
@@ -165,6 +190,8 @@ class BaseTest(object):
             return False
         if self.requiresGPG2 and self.gpgFinder.gpg2 is None:
             return False
+        if self.requiresDot and self.dotFinder.dot is None:
+            return False
 
         return True
 
@@ -368,6 +395,9 @@ class BaseTest(object):
         self.prepare_default_config()
         self.prepare_fixture()
 
+    def teardown(self):
+        pass
+
     def start_webserver(self, directory):
         FileHTTPServerRequestHandler.rootPath = directory
         self.webserver = ThreadedTCPServer(
diff --git a/system/run.py b/system/run.py
index 82d49d4e..062b8ca3 100755
--- a/system/run.py
+++ b/system/run.py
@@ -5,9 +5,11 @@ import importlib
 import os
 import inspect
 import fnmatch
+import re
 import sys
 import traceback
 import random
+import subprocess
 
 from lib import BaseTest
 from s3_lib import S3Test
@@ -22,9 +24,14 @@ except ImportError:
         return s
 
 
+def natural_key(string_):
+    """See https://blog.codinghorror.com/sorting-for-humans-natural-sort-order/"""
+    return [int(s) if s.isdigit() else s for s in re.split(r'(\d+)', string_)]
+
+
 def walk_modules(package):
     yield importlib.import_module(package)
-    for name in glob.glob(package + "/*.py"):
+    for name in sorted(glob.glob(package + "/*.py"), key=natural_key):
         name = os.path.splitext(os.path.basename(name))[0]
         if name == "__init__":
             continue
@@ -37,14 +44,14 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non
     Run system test.
     """
     if not tests:
-        tests = glob.glob("t*_*")
+        tests = sorted(glob.glob("t*_*"), key=natural_key)
     fails = []
     numTests = numFailed = numSkipped = 0
     lastBase = None
 
     for test in tests:
         for testModule in walk_modules(test):
-            for name in dir(testModule):
+            for name in sorted(dir(testModule), key=natural_key):
                 o = getattr(testModule, name)
 
                 if not (inspect.isclass(o) and issubclass(o, BaseTest) and o is not BaseTest and
@@ -72,9 +79,13 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non
                 sys.stdout.flush()
 
                 t = o()
-                if t.longTest and not include_long_tests or not t.fixture_available():
+                if t.longTest and not include_long_tests or not t.fixture_available() or t.skipTest:
                     numSkipped += 1
-                    sys.stdout.write(colored("SKIP\n", color="yellow"))
+                    msg = 'SKIP'
+                    if t.skipTest and t.skipTest is not True:
+                        # If we have a reason to skip, print it
+                        msg += ': ' + t.skipTest
+                    sys.stdout.write(colored(msg + "\n", color="yellow"))
                     continue
 
                 numTests += 1
@@ -82,7 +93,7 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non
                 try:
                     t.captureResults = capture_results
                     t.test()
-                except BaseException:
+                except Exception:
                     numFailed += 1
                     typ, val, tb = sys.exc_info()
                     fails.append((test, t, typ, val, tb, testModule))
@@ -120,6 +131,14 @@ if __name__ == "__main__":
         except BaseException, e:
             print "Failed to capture current version: ", e
 
+    output = subprocess.check_output(['gpg', '--version'])
+    if not output.startswith('gpg (GnuPG) 1'):
+        raise RuntimeError('Tests require gpg v1')
+
+    output = subprocess.check_output(['gpgv', '--version'])
+    if not output.startswith('gpgv (GnuPG) 1'):
+        raise RuntimeError('Tests require gpgv v1')
+
     os.chdir(os.path.realpath(os.path.dirname(sys.argv[0])))
     random.seed()
     include_long_tests = False
diff --git a/system/t02_config/ConfigShowTest_gold b/system/t02_config/ConfigShowTest_gold
index 4157c96a..df79c7c8 100644
--- a/system/t02_config/ConfigShowTest_gold
+++ b/system/t02_config/ConfigShowTest_gold
@@ -21,5 +21,6 @@
     "FileSystemPublishEndpoints": {},
     "S3PublishEndpoints": {},
     "SwiftPublishEndpoints": {},
-    "AzurePublishEndpoints": {}
+    "AzurePublishEndpoints": {},
+    "AsyncAPI": false
 }
diff --git a/system/t02_config/CreateConfigTest_gold b/system/t02_config/CreateConfigTest_gold
index 013cd4db..7f04a8be 100644
--- a/system/t02_config/CreateConfigTest_gold
+++ b/system/t02_config/CreateConfigTest_gold
@@ -21,5 +21,6 @@
   "FileSystemPublishEndpoints": {},
   "S3PublishEndpoints": {},
   "SwiftPublishEndpoints": {},
-  "AzurePublishEndpoints": {}
-}
\ No newline at end of file
+  "AzurePublishEndpoints": {},
+  "AsyncAPI": false
+}
diff --git a/system/t04_mirror/CreateMirror10Test_gold b/system/t04_mirror/CreateMirror10Test_gold
index d22f8d99..454968b1 100644
--- a/system/t04_mirror/CreateMirror10Test_gold
+++ b/system/t04_mirror/CreateMirror10Test_gold
@@ -1,11 +1,14 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease
 
 gpgv:  RSA key ID 22F3D138
 
 gpgv:  RSA key ID 386FA1D9
 
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/Release
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/Release.gpg...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/Release.gpg
 
 gpgv:  RSA key ID 22F3D138
 
diff --git a/system/t04_mirror/CreateMirror13Test_gold b/system/t04_mirror/CreateMirror13Test_gold
index 74f2c279..e3af17b0 100644
--- a/system/t04_mirror/CreateMirror13Test_gold
+++ b/system/t04_mirror/CreateMirror13Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 
 Mirror [mirror13]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added.
 You can run 'aptly mirror update mirror13' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror14Test_gold b/system/t04_mirror/CreateMirror14Test_gold
index 5d2cf0d4..2ca76b61 100644
--- a/system/t04_mirror/CreateMirror14Test_gold
+++ b/system/t04_mirror/CreateMirror14Test_gold
@@ -1,4 +1,5 @@
 Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/InRelease...
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/InRelease
 gpgv:  RSA key ID 115C3D8A
 gpgv: Good signature from "Johannes Ranke (Wissenschaftlicher Berater) <johannes.ranke@jrwb.de>"
 gpgv:                 aka "Johannes Ranke <jranke@uni-bremen.de>"
diff --git a/system/t04_mirror/CreateMirror16Test_gold b/system/t04_mirror/CreateMirror16Test_gold
index c75df26d..8badf778 100644
--- a/system/t04_mirror/CreateMirror16Test_gold
+++ b/system/t04_mirror/CreateMirror16Test_gold
@@ -1,2 +1,3 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 ERROR: unable to fetch mirror: architecture source not available in repo [mirror16]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-architectures to override
diff --git a/system/t04_mirror/CreateMirror17Test_gold b/system/t04_mirror/CreateMirror17Test_gold
index 837d37a0..d552ada6 100644
--- a/system/t04_mirror/CreateMirror17Test_gold
+++ b/system/t04_mirror/CreateMirror17Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 
 Mirror [mirror17]: http://cdn-fastly.deb.debian.org/debian/ stretch [src] successfully added.
 You can run 'aptly mirror update mirror17' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror19Test_gold b/system/t04_mirror/CreateMirror19Test_gold
index 285a180f..97eae908 100644
--- a/system/t04_mirror/CreateMirror19Test_gold
+++ b/system/t04_mirror/CreateMirror19Test_gold
@@ -1,4 +1,5 @@
 Downloading http://security.debian.org/dists/stretch/updates/InRelease...
+Success downloading http://security.debian.org/dists/stretch/updates/InRelease
 gpgv:  RSA key ID 331F7F50
 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
 gpgv:  RSA key ID E562B32A
diff --git a/system/t04_mirror/CreateMirror1Test_gold b/system/t04_mirror/CreateMirror1Test_gold
index 38b02b48..a14855d8 100644
--- a/system/t04_mirror/CreateMirror1Test_gold
+++ b/system/t04_mirror/CreateMirror1Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 
 Mirror [mirror1]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added.
 You can run 'aptly mirror update mirror1' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror22Test_gold b/system/t04_mirror/CreateMirror22Test_gold
index 1bbe150d..dc74de6a 100644
--- a/system/t04_mirror/CreateMirror22Test_gold
+++ b/system/t04_mirror/CreateMirror22Test_gold
@@ -1,4 +1,5 @@
 Downloading http://security.debian.org/dists/stretch/updates/Release...
+Success downloading http://security.debian.org/dists/stretch/updates/Release
 
 Mirror [mirror22]: http://security.debian.org/ stretch/updates successfully added.
 You can run 'aptly mirror update mirror22' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror24Test_gold b/system/t04_mirror/CreateMirror24Test_gold
index 083a7245..4ca1af86 100644
--- a/system/t04_mirror/CreateMirror24Test_gold
+++ b/system/t04_mirror/CreateMirror24Test_gold
@@ -1,4 +1,5 @@
 Downloading http://security.debian.org/dists/stretch/updates/InRelease...
+Success downloading http://security.debian.org/dists/stretch/updates/InRelease
 gpgv:  RSA key ID 331F7F50
 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
 gpgv:  RSA key ID E562B32A
diff --git a/system/t04_mirror/CreateMirror25Test_gold b/system/t04_mirror/CreateMirror25Test_gold
index 7071f523..511269d4 100644
--- a/system/t04_mirror/CreateMirror25Test_gold
+++ b/system/t04_mirror/CreateMirror25Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 
 Mirror [mirror25]: http://cdn-fastly.deb.debian.org/debian/ stretch [udeb] successfully added.
 You can run 'aptly mirror update mirror25' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror27Test_gold b/system/t04_mirror/CreateMirror27Test_gold
index 99f7575d..9ce7ec99 100644
--- a/system/t04_mirror/CreateMirror27Test_gold
+++ b/system/t04_mirror/CreateMirror27Test_gold
@@ -1,5 +1,6 @@
 Downloading http://linux.dell.com/repo/community/ubuntu/dists/wheezy/Release...
 Following redirect to https://linux.dell.com/repo/community/ubuntu/dists/wheezy/Release...
+Success downloading http://linux.dell.com/repo/community/ubuntu/dists/wheezy/Release
 
 Mirror [mirror27]: http://linux.dell.com/repo/community/ubuntu/ wheezy successfully added.
 You can run 'aptly mirror update mirror27' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror29Test_gold b/system/t04_mirror/CreateMirror29Test_gold
index fba328a7..a145a294 100644
--- a/system/t04_mirror/CreateMirror29Test_gold
+++ b/system/t04_mirror/CreateMirror29Test_gold
@@ -3,6 +3,7 @@ openpgp:  RSA key ID 648ACFD622F3D138
 openpgp: Good signature from "Debian Archive Automatic Signing Key (10/buster) <ftpmaster@debian.org>"
 openpgp:  RSA key ID 0E98404D386FA1D9
 openpgp: Good signature from "Debian Archive Automatic Signing Key (11/bullseye) <ftpmaster@debian.org>"
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease
 
 Mirror [mirror9]: http://cdn-fastly.deb.debian.org/debian/ stretch-backports successfully added.
 You can run 'aptly mirror update mirror9' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror2Test_gold b/system/t04_mirror/CreateMirror2Test_gold
index c8c20aa7..2f74f102 100644
--- a/system/t04_mirror/CreateMirror2Test_gold
+++ b/system/t04_mirror/CreateMirror2Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 
 Mirror [mirror2]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added.
 You can run 'aptly mirror update mirror2' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror3Test_gold b/system/t04_mirror/CreateMirror3Test_gold
index db292edf..5fabc64f 100644
--- a/system/t04_mirror/CreateMirror3Test_gold
+++ b/system/t04_mirror/CreateMirror3Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 
 Mirror [mirror3]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added.
 You can run 'aptly mirror update mirror3' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror4Test_gold b/system/t04_mirror/CreateMirror4Test_gold
index 7923c8ca..0824a5ea 100644
--- a/system/t04_mirror/CreateMirror4Test_gold
+++ b/system/t04_mirror/CreateMirror4Test_gold
@@ -1,2 +1,3 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 ERROR: unable to fetch mirror: component life not available in repo [mirror4]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-components to override
diff --git a/system/t04_mirror/CreateMirror5Test_gold b/system/t04_mirror/CreateMirror5Test_gold
index b859fe2b..3bbe6335 100644
--- a/system/t04_mirror/CreateMirror5Test_gold
+++ b/system/t04_mirror/CreateMirror5Test_gold
@@ -1,2 +1,3 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 ERROR: unable to fetch mirror: architecture nano68 not available in repo [mirror5]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-architectures to override
diff --git a/system/t04_mirror/CreateMirror7Test_gold b/system/t04_mirror/CreateMirror7Test_gold
index ace393ab..e527f84e 100644
--- a/system/t04_mirror/CreateMirror7Test_gold
+++ b/system/t04_mirror/CreateMirror7Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 
 Mirror [mirror7]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added.
 You can run 'aptly mirror update mirror7' to download repository contents.
diff --git a/system/t04_mirror/CreateMirror8Test_gold b/system/t04_mirror/CreateMirror8Test_gold
index e4e2e835..69138eca 100644
--- a/system/t04_mirror/CreateMirror8Test_gold
+++ b/system/t04_mirror/CreateMirror8Test_gold
@@ -1,2 +1,3 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 ERROR: unable to add mirror: mirror with name mirror8 already exists
diff --git a/system/t04_mirror/CreateMirror9Test_gold b/system/t04_mirror/CreateMirror9Test_gold
index 8b35e04b..d3be9e6a 100644
--- a/system/t04_mirror/CreateMirror9Test_gold
+++ b/system/t04_mirror/CreateMirror9Test_gold
@@ -1,4 +1,5 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease
 gpgv:  RSA key ID 22F3D138
 gpgv: Good signature from "Debian Archive Automatic Signing Key (10/buster) <ftpmaster@debian.org>"
 gpgv:  RSA key ID 386FA1D9
diff --git a/system/t04_mirror/EditMirror10Test_gold b/system/t04_mirror/EditMirror10Test_gold
index 32091131..563cdde8 100644
--- a/system/t04_mirror/EditMirror10Test_gold
+++ b/system/t04_mirror/EditMirror10Test_gold
@@ -1,2 +1,3 @@
 Downloading ftp://ftp.ch.debian.org/debian/dists/stretch/Release...
+Success downloading ftp://ftp.ch.debian.org/debian/dists/stretch/Release
 Mirror [mirror10]: ftp://ftp.ch.debian.org/debian/ stretch successfully updated.
diff --git a/system/t04_mirror/EditMirror6Test_gold b/system/t04_mirror/EditMirror6Test_gold
index a092c6fd..bc37c97b 100644
--- a/system/t04_mirror/EditMirror6Test_gold
+++ b/system/t04_mirror/EditMirror6Test_gold
@@ -1,2 +1,3 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 Mirror [mirror6]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully updated.
diff --git a/system/t04_mirror/EditMirror7Test_gold b/system/t04_mirror/EditMirror7Test_gold
index b7de541d..2c57a1b6 100644
--- a/system/t04_mirror/EditMirror7Test_gold
+++ b/system/t04_mirror/EditMirror7Test_gold
@@ -1,2 +1,3 @@
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
 ERROR: unable to edit: architecture x56 not available in repo [stretch]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-architectures to override
diff --git a/system/t04_mirror/UpdateMirror10Test_gold b/system/t04_mirror/UpdateMirror10Test_gold
index d1c488fd..e1e94596 100644
--- a/system/t04_mirror/UpdateMirror10Test_gold
+++ b/system/t04_mirror/UpdateMirror10Test_gold
@@ -18,6 +18,18 @@ Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.
 Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_i386.deb...
 Mirror `flat-src` has been successfully updated.
 Packages filtered: 107 -> 9.
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/InRelease
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/Packages.bz2
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/Sources.bz2
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/dh-r_20180403~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.5-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.6-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/pkg-r-autopkgtest_20180403~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/python3-rpy2_2.9.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/python3-rpy2_2.9.5-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward-data_0.6.5-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_i386.deb
 gpgv:                 aka "Johannes Ranke <jranke@uni-bremen.de>"
 gpgv: Good signature from "Johannes Ranke (Wissenschaftlicher Berater) <johannes.ranke@jrwb.de>"
 gpgv:  RSA key ID 115C3D8A
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror13Test_gold b/system/t04_mirror/UpdateMirror13Test_gold
index f4902704..4f6c6a66 100644
--- a/system/t04_mirror/UpdateMirror13Test_gold
+++ b/system/t04_mirror/UpdateMirror13Test_gold
@@ -58,4 +58,59 @@ Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/ma
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish-dbg_3.0.3-1~wheezy_i386.deb...
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_amd64.deb...
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_i386.deb...
-Mirror `varnish` has been successfully updated.
\ No newline at end of file
+Mirror `varnish` has been successfully updated.
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/Release
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-amd64/Packages.bz2
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-i386/Packages.bz2
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi-dev_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi-dev_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi1_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi1_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi-dev_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi-dev_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi1_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi1_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi-dev_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi-dev_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi1_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi1_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi-dev_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi-dev_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi1_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi1_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi-dev_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi-dev_3.0.3-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi1_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi1_3.0.3-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish-dbg_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish-dbg_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish-doc_3.0.4-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish-dbg_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish-dbg_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish-doc_3.0.5-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish-dbg_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish-dbg_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish-doc_3.0.6-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish-dbg_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish-dbg_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish-doc_3.0.7-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%281.16.0%29/varnish-agent_1.16.0~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.0%29/varnish-agent_2.2.0~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.0%29/varnish-agent_2.2.0~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.1%29/varnish-agent_2.2.1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.1%29/varnish-agent_2.2.1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.1+nmu1%29/varnish-agent_2.2.1+nmu1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%283.0.0%29/varnish-agent_3.0.0~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%283.0.1%29/varnish-agent_3.0.1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish-dbg_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish-dbg_3.0.3-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_i386.deb
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror14Test_gold b/system/t04_mirror/UpdateMirror14Test_gold
index 4c192bc1..2c66db83 100644
--- a/system/t04_mirror/UpdateMirror14Test_gold
+++ b/system/t04_mirror/UpdateMirror14Test_gold
@@ -6,4 +6,7 @@ Downloading & parsing package files...
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/Release...
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-amd64/Packages.bz2...
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-i386/Packages.bz2...
-Mirror `varnish` has been successfully updated.
\ No newline at end of file
+Mirror `varnish` has been successfully updated.
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/Release
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-amd64/Packages.bz2
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-i386/Packages.bz2
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror17Test_gold b/system/t04_mirror/UpdateMirror17Test_gold
index 726690f3..b99be85c 100644
--- a/system/t04_mirror/UpdateMirror17Test_gold
+++ b/system/t04_mirror/UpdateMirror17Test_gold
@@ -7,4 +7,6 @@ Downloading & parsing package files...
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-i386/Packages.gz...
 Mirror `stretch` has been successfully updated.
-Packages filtered: 50604 -> 1.
\ No newline at end of file
+Packages filtered: 50604 -> 1.
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-i386/Packages.gz
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror18Test_gold b/system/t04_mirror/UpdateMirror18Test_gold
index ad599e34..33e2dd98 100644
--- a/system/t04_mirror/UpdateMirror18Test_gold
+++ b/system/t04_mirror/UpdateMirror18Test_gold
@@ -8,4 +8,7 @@ Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release...
 Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-i386/Packages.gz...
 Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/b/boost-defaults/libboost-program-options-dev_1.62.0.1_i386.deb...
 Mirror `stretch` has been successfully updated.
-Packages filtered: 50604 -> 1.
\ No newline at end of file
+Packages filtered: 50604 -> 1.
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release
+Success downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-i386/Packages.gz
+Success downloading http://cdn-fastly.deb.debian.org/debian/pool/main/b/boost-defaults/libboost-program-options-dev_1.62.0.1_i386.deb
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror1Test_gold b/system/t04_mirror/UpdateMirror1Test_gold
index f4902704..4f6c6a66 100644
--- a/system/t04_mirror/UpdateMirror1Test_gold
+++ b/system/t04_mirror/UpdateMirror1Test_gold
@@ -58,4 +58,59 @@ Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/ma
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish-dbg_3.0.3-1~wheezy_i386.deb...
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_amd64.deb...
 Downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_i386.deb...
-Mirror `varnish` has been successfully updated.
\ No newline at end of file
+Mirror `varnish` has been successfully updated.
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/Release
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-amd64/Packages.bz2
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/dists/wheezy/main/binary-i386/Packages.bz2
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi-dev_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi-dev_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi1_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.4-1%29/libvarnishapi1_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi-dev_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi-dev_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi1_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.5-1%29/libvarnishapi1_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi-dev_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi-dev_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi1_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.6-1%29/libvarnishapi1_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi-dev_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi-dev_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi1_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish%20%283.0.7-1%29/libvarnishapi1_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi-dev_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi-dev_3.0.3-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi1_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/libv/varnish/libvarnishapi1_3.0.3-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish-dbg_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish-dbg_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish-doc_3.0.4-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish_3.0.4-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.4-1%29/varnish_3.0.4-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish-dbg_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish-dbg_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish-doc_3.0.5-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish_3.0.5-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.5-1%29/varnish_3.0.5-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish-dbg_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish-dbg_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish-doc_3.0.6-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish_3.0.6-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.6-1%29/varnish_3.0.6-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish-dbg_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish-dbg_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish-doc_3.0.7-1~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish_3.0.7-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish%20%283.0.7-1%29/varnish_3.0.7-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%281.16.0%29/varnish-agent_1.16.0~wheezy_all.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.0%29/varnish-agent_2.2.0~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.0%29/varnish-agent_2.2.0~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.1%29/varnish-agent_2.2.1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.1%29/varnish-agent_2.2.1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%282.2.1+nmu1%29/varnish-agent_2.2.1+nmu1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%283.0.0%29/varnish-agent_3.0.0~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish-agent%20%283.0.1%29/varnish-agent_3.0.1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish-dbg_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish-dbg_3.0.3-1~wheezy_i386.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_amd64.deb
+Success downloading https://packagecloud.io/varnishcache/varnish30/debian/pool/wheezy/main/v/varnish/varnish_3.0.3-1~wheezy_i386.deb
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror20Test_gold b/system/t04_mirror/UpdateMirror20Test_gold
index 2f9779c7..ef7ecd29 100644
--- a/system/t04_mirror/UpdateMirror20Test_gold
+++ b/system/t04_mirror/UpdateMirror20Test_gold
@@ -13,5 +13,11 @@ Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-cl
 Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0_i386.deb...
 Mirror `flat` has been successfully updated.
 Packages filtered: 78 -> 4.
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/InRelease
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/Packages.bz2
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0_i386.deb
 openpgp: Good signature from "Johannes Ranke (Wissenschaftlicher Berater) <johannes.ranke@jrwb.de>"
 openpgp:  RSA key ID FCAE2A0E115C3D8A
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror22Test_gold b/system/t04_mirror/UpdateMirror22Test_gold
index c81f004e..ceeaf7ce 100644
--- a/system/t04_mirror/UpdateMirror22Test_gold
+++ b/system/t04_mirror/UpdateMirror22Test_gold
@@ -1,8 +1,10 @@
 Downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/InRelease...
 openpgp:  RSA key ID DDCAE044F796ECB0
 openpgp: Good signature from "NVIDIA CORPORATION (Open Source Projects) <cudatools@nvidia.com>"
+Success downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/InRelease
 Downloading & parsing package files...
 Downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/Packages.xz...
+Success downloading https://nvidia.github.io/libnvidia-container/ubuntu16.04/amd64/Packages.xz
 Applying filter...
 
 Building download queue...
diff --git a/system/t04_mirror/UpdateMirror3Test_gold b/system/t04_mirror/UpdateMirror3Test_gold
index 4934fde1..cc9a36e1 100644
--- a/system/t04_mirror/UpdateMirror3Test_gold
+++ b/system/t04_mirror/UpdateMirror3Test_gold
@@ -1,4 +1,8 @@
 Downloading ${url}dists/hardy/Release...
+Success downloading ${url}dists/hardy/Release
 Downloading & parsing package files...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages...
+Error downloading ${url}dists/hardy/main/binary-amd64/Packages: ${url}dists/hardy/main/binary-amd64/Packages: sha256 hash mismatch "494414ded24da13c451b13b424928821351c78fce49f93d9e1b55f102790c206" != "8a21688ae769f2b4ffcaa366409f679d" retrying...
+Retrying 0 ${url}dists/hardy/main/binary-amd64/Packages...
+Giving up on ${url}dists/hardy/main/binary-amd64/Packages...
 ERROR: unable to update: ${url}dists/hardy/main/binary-amd64/Packages: sha256 hash mismatch "494414ded24da13c451b13b424928821351c78fce49f93d9e1b55f102790c206" != "8a21688ae769f2b4ffcaa366409f679d"
diff --git a/system/t04_mirror/UpdateMirror4Test_gold b/system/t04_mirror/UpdateMirror4Test_gold
index dc022217..d8ba9728 100644
--- a/system/t04_mirror/UpdateMirror4Test_gold
+++ b/system/t04_mirror/UpdateMirror4Test_gold
@@ -1,8 +1,19 @@
 Downloading ${url}dists/hardy/Release...
+Success downloading ${url}dists/hardy/Release
 Downloading & parsing package files...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages.bz2...
+Error downloading ${url}dists/hardy/main/binary-amd64/Packages.bz2: HTTP code 404 while fetching ${url}dists/hardy/main/binary-amd64/Packages.bz2 retrying...
+Retrying 0 ${url}dists/hardy/main/binary-amd64/Packages.bz2...
+Giving up on ${url}dists/hardy/main/binary-amd64/Packages.bz2...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages.gz...
+Error downloading ${url}dists/hardy/main/binary-amd64/Packages.gz: HTTP code 404 while fetching ${url}dists/hardy/main/binary-amd64/Packages.gz retrying...
+Retrying 0 ${url}dists/hardy/main/binary-amd64/Packages.gz...
+Giving up on ${url}dists/hardy/main/binary-amd64/Packages.gz...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages.xz...
+Error downloading ${url}dists/hardy/main/binary-amd64/Packages.xz: HTTP code 404 while fetching ${url}dists/hardy/main/binary-amd64/Packages.xz retrying...
+Retrying 0 ${url}dists/hardy/main/binary-amd64/Packages.xz...
+Giving up on ${url}dists/hardy/main/binary-amd64/Packages.xz...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages...
 WARNING: ${url}dists/hardy/main/binary-amd64/Packages: sha256 hash mismatch "494414ded24da13c451b13b424928821351c78fce49f93d9e1b55f102790c206" != "8a21688ae769f2b4ffcaa366409f679d"
+Success downloading ${url}dists/hardy/main/binary-amd64/Packages
 ERROR: unable to update: malformed stanza syntax
diff --git a/system/t04_mirror/UpdateMirror5Test_gold b/system/t04_mirror/UpdateMirror5Test_gold
index 60878f00..61d8087c 100644
--- a/system/t04_mirror/UpdateMirror5Test_gold
+++ b/system/t04_mirror/UpdateMirror5Test_gold
@@ -1,8 +1,13 @@
 Downloading ${url}dists/hardy/Release...
+Success downloading ${url}dists/hardy/Release
 Downloading & parsing package files...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages...
+Success downloading ${url}dists/hardy/main/binary-amd64/Packages
 Building download queue...
 Download queue: 1 items (30 B)
 Downloading ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb...
+Error downloading ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb: ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb: sha1 hash mismatch "8d3a014000038725d6daf8771b42a0784253688f" != "66b27417d37e024c46526c2f6d358a754fc552f3" retrying...
+Retrying 0 ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb...
+Giving up on ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb...
 ERROR: unable to update: download errors:
   ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb: sha1 hash mismatch "8d3a014000038725d6daf8771b42a0784253688f" != "66b27417d37e024c46526c2f6d358a754fc552f3"
diff --git a/system/t04_mirror/UpdateMirror6Test_gold b/system/t04_mirror/UpdateMirror6Test_gold
index de1c5aa5..cd5b73c4 100644
--- a/system/t04_mirror/UpdateMirror6Test_gold
+++ b/system/t04_mirror/UpdateMirror6Test_gold
@@ -1,12 +1,24 @@
 Downloading ${url}dists/hardy/Release...
+Success downloading ${url}dists/hardy/Release
 Downloading & parsing package files...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages.bz2...
+Error downloading ${url}dists/hardy/main/binary-amd64/Packages.bz2: HTTP code 404 while fetching ${url}dists/hardy/main/binary-amd64/Packages.bz2 retrying...
+Retrying 0 ${url}dists/hardy/main/binary-amd64/Packages.bz2...
+Giving up on ${url}dists/hardy/main/binary-amd64/Packages.bz2...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages.gz...
+Error downloading ${url}dists/hardy/main/binary-amd64/Packages.gz: HTTP code 404 while fetching ${url}dists/hardy/main/binary-amd64/Packages.gz retrying...
+Retrying 0 ${url}dists/hardy/main/binary-amd64/Packages.gz...
+Giving up on ${url}dists/hardy/main/binary-amd64/Packages.gz...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages.xz...
+Error downloading ${url}dists/hardy/main/binary-amd64/Packages.xz: HTTP code 404 while fetching ${url}dists/hardy/main/binary-amd64/Packages.xz retrying...
+Retrying 0 ${url}dists/hardy/main/binary-amd64/Packages.xz...
+Giving up on ${url}dists/hardy/main/binary-amd64/Packages.xz...
 Downloading ${url}dists/hardy/main/binary-amd64/Packages...
+Success downloading ${url}dists/hardy/main/binary-amd64/Packages
 Building download queue...
 Download queue: 1 items (30 B)
 Downloading ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb...
 WARNING: ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb: sha1 hash mismatch "8d3a014000038725d6daf8771b42a0784253688f" != "66b27417d37e024c46526c2f6d358a754fc552f3"
+Success downloading ${url}pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb
 
 Mirror `failure` has been successfully updated.
diff --git a/system/t04_mirror/UpdateMirror7Test_gold b/system/t04_mirror/UpdateMirror7Test_gold
index 5688e905..1f2a4b27 100644
--- a/system/t04_mirror/UpdateMirror7Test_gold
+++ b/system/t04_mirror/UpdateMirror7Test_gold
@@ -84,6 +84,86 @@ Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward-da
 Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_amd64.deb...
 Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_i386.deb...
 Mirror `flat` has been successfully updated.
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/InRelease
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/Packages.bz2
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/dh-r_20180403~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.5-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.6-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/pkg-r-autopkgtest_20180403~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/python3-rpy2_2.9.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/python3-rpy2_2.9.5-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.2-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.2-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.2-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.2-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-dev_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-dev_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-html_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-html_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-boot_1.3-20-2~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-cluster_2.0.7-1-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-cluster_2.0.7-1-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-coda_0.19-1-2~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-codetools_0.2-15-2~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-codetools_0.2-16-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-foreign_0.8.71-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-foreign_0.8.71-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-kernsmooth_2.23-15-3~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-kernsmooth_2.23-15-3~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-35-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-35-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-38-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-38-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-littler_0.3.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-littler_0.3.5-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-littler_0.3.6-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mass_7.3-51.1-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mass_7.3-51.1-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-15-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-15-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-16-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-16-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-26-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-26-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-27-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-27-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nlme_3.1.137-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nlme_3.1.137-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nnet_7.3-12-2~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nnet_7.3-12-2~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rodbc_1.3-15-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rodbc_1.3-15-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rpart_4.1-13-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rpart_4.1-13-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-spatial_7.3-11-2~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-spatial_7.3-11-2~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-survival_2.43-3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-survival_2.43-3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-html_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-html_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-info_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-info_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-pdf_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-pdf_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.2-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.2-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-recommended_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-recommended_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward-data_0.6.5-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_i386.deb
 gpgv:                 aka "Johannes Ranke <jranke@uni-bremen.de>"
 gpgv: Good signature from "Johannes Ranke (Wissenschaftlicher Berater) <johannes.ranke@jrwb.de>"
 gpgv:  RSA key ID 115C3D8A
\ No newline at end of file
diff --git a/system/t04_mirror/UpdateMirror9Test_gold b/system/t04_mirror/UpdateMirror9Test_gold
index 81f9d49b..84d8e129 100644
--- a/system/t04_mirror/UpdateMirror9Test_gold
+++ b/system/t04_mirror/UpdateMirror9Test_gold
@@ -171,6 +171,173 @@ Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/survival_
 Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/survival_2.43-3-1~jessiecran.0.dsc...
 Downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/survival_2.43-3.orig.tar.gz...
 Mirror `flat-src` has been successfully updated.
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/InRelease
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/Packages.bz2
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/Sources.bz2
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/boot_1.3-20-2~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/boot_1.3-20-2~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/boot_1.3-20.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/cluster_2.0.7-1-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/cluster_2.0.7-1-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/cluster_2.0.7-1.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/codetools_0.2-15-2~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/codetools_0.2-15-2~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/codetools_0.2-15.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/codetools_0.2-16-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/codetools_0.2-16-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/codetools_0.2-16.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/dh-r_20180403~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/dh-r_20180403~jessiecran.0.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/dh-r_20180403~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/foreign_0.8.71-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/foreign_0.8.71-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/foreign_0.8.71.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/kernsmooth_2.23-15-3~jessiecran.0.diff.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/kernsmooth_2.23-15-3~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/kernsmooth_2.23-15.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/lattice_0.20-35-1~jessiecran.0.diff.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/lattice_0.20-35-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/lattice_0.20-35.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/lattice_0.20-38-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/lattice_0.20-38-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/lattice_0.20-38.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.5-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.5-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.5-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.5.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.6-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.6-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.6-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/littler_0.3.6.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/mgcv_1.8-26-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/mgcv_1.8-26-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/mgcv_1.8-26.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/mgcv_1.8-27-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/mgcv_1.8-27-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/mgcv_1.8-27.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/nlme_3.1.137-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/nlme_3.1.137-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/nlme_3.1.137.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/pkg-r-autopkgtest_20180403~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/python3-rpy2_2.9.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/python3-rpy2_2.9.5-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.2-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.2-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core-dbg_3.5.3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.2-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.2-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-core_3.5.3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-dev_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-dev_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-html_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base-html_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.2-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.2-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.2.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.3-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.3-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-base_3.5.3.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-boot_1.3-20-2~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0.diff.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14-2~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-14.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-class_7.3-15.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-cluster_2.0.7-1-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-cluster_2.0.7-1-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-coda_0.19-1-2~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-coda_0.19-1-2~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-coda_0.19-1-2~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-coda_0.19-1.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-codetools_0.2-15-2~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-codetools_0.2-16-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-foreign_0.8.71-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-foreign_0.8.71-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-kernsmooth_2.23-15-3~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-kernsmooth_2.23-15-3~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-35-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-35-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-38-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-lattice_0.20-38-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-littler_0.3.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-littler_0.3.5-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-littler_0.3.6-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mass_7.3-51.1-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mass_7.3-51.1-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mass_7.3-51.1-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mass_7.3-51.1-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mass_7.3-51.1.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-15-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-15-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-16-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-matrix_1.2-16-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-26-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-26-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-27-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-mgcv_1.8-27-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nlme_3.1.137-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nlme_3.1.137-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nnet_7.3-12-2~jessiecran.0.diff.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nnet_7.3-12-2~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nnet_7.3-12-2~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nnet_7.3-12-2~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-nnet_7.3-12.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rodbc_1.3-15-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rodbc_1.3-15-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rpart_4.1-13-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-rpart_4.1-13-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-spatial_7.3-11-2~jessiecran.0.diff.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-spatial_7.3-11-2~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-spatial_7.3-11-2~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-spatial_7.3-11-2~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-spatial_7.3-11.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-survival_2.43-3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-cran-survival_2.43-3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-html_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-html_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-info_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-info_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-pdf_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-doc-pdf_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.2-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.2-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.3-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-mathlib_3.5.3-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-recommended_3.5.2-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/r-recommended_3.5.3-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward-data_0.6.5-1~jessiecran.0_all.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_amd64.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5-1~jessiecran.0_i386.deb
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rkward_0.6.5.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rmatrix_1.2-15-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rmatrix_1.2-15-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rmatrix_1.2-15.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rmatrix_1.2-16-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rmatrix_1.2-16-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rmatrix_1.2-16.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rodbc_1.3-15-1~jessiecran.0.diff.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rodbc_1.3-15-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rodbc_1.3-15.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rpart_4.1-13-1~jessiecran.0.diff.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rpart_4.1-13-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rpart_4.1-13.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rpy2_2.9.5-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rpy2_2.9.5-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/rpy2_2.9.5.orig.tar.gz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/survival_2.43-3-1~jessiecran.0.debian.tar.xz
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/survival_2.43-3-1~jessiecran.0.dsc
+Success downloading https://cloud.r-project.org/bin/linux/debian/jessie-cran35/survival_2.43-3.orig.tar.gz
 gpgv:                 aka "Johannes Ranke <jranke@uni-bremen.de>"
 gpgv: Good signature from "Johannes Ranke (Wissenschaftlicher Berater) <johannes.ranke@jrwb.de>"
 gpgv:  RSA key ID 115C3D8A
\ No newline at end of file
diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py
index e15eae2b..ba9adbe9 100644
--- a/system/t04_mirror/create.py
+++ b/system/t04_mirror/create.py
@@ -58,6 +58,7 @@ class CreateMirror6Test(BaseTest):
     """
     create mirror: missing release
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     expectedCode = 1
     requiresGPG1 = True
 
@@ -124,6 +125,7 @@ class CreateMirror11Test(BaseTest):
     """
     create mirror: repo with Release + Release.gpg verification
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://cdn-fastly.deb.debian.org/debian/ stretch"
     fixtureGpg = True
 
@@ -139,6 +141,7 @@ class CreateMirror12Test(BaseTest):
     """
     create mirror: repo with Release+Release.gpg verification, failure
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror12 http://cdn-fastly.deb.debian.org/debian/ stretch"
     fixtureGpg = False
     gold_processor = BaseTest.expand_environ
@@ -211,6 +214,7 @@ class CreateMirror18Test(BaseTest):
     """
     create mirror: mirror with ppa URL
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     fixtureGpg = True
     configOverride = {
         "ppaDistributorID": "ubuntu",
@@ -251,6 +255,7 @@ class CreateMirror20Test(BaseTest):
     """
     create mirror: using failing HTTP_PROXY
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     fixtureGpg = True
 
     runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://security.debian.org/ stretch/updates main"
@@ -274,6 +279,7 @@ class CreateMirror21Test(BaseTest):
     """
     create mirror: flat repository in subdir
     """
+    skipTest = "Requesting obsolete file - InRelease"
     runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror21 http://pkg.jenkins-ci.org/debian-stable binary/"
     fixtureGpg = True
 
@@ -377,6 +383,7 @@ class CreateMirror30Test(BaseTest):
     """
     create mirror: repo with InRelease verification, failure  (internal GPG implementation)
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://cdn-fastly.deb.debian.org/debian/ stretch"
     configOverride = {"gpgProvider": "internal"}
     gold_processor = BaseTest.expand_environ
@@ -391,6 +398,7 @@ class CreateMirror31Test(BaseTest):
     """
     create mirror: repo with Release + Release.gpg verification (internal GPG implementation)
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://cdn-fastly.deb.debian.org/debian/ stretch"
     configOverride = {"gpgProvider": "internal"}
     fixtureGpg = True
diff --git a/system/t04_mirror/update.py b/system/t04_mirror/update.py
index 71a98dc3..13fc379a 100644
--- a/system/t04_mirror/update.py
+++ b/system/t04_mirror/update.py
@@ -45,6 +45,9 @@ class UpdateMirror3Test(BaseTest):
         "aptly mirror create --ignore-signatures failure ${url} hardy main",
     ]
     fixtureWebServer = "test_release"
+    configOverride = {
+        "downloadRetries": 0,
+    }
     runCmd = "aptly mirror update --ignore-signatures failure"
     expectedCode = 1
 
@@ -60,6 +63,9 @@ class UpdateMirror4Test(BaseTest):
         "aptly mirror create --ignore-signatures failure ${url} hardy main",
     ]
     fixtureWebServer = "test_release"
+    configOverride = {
+        "downloadRetries": 0,
+    }
     runCmd = "aptly mirror update -ignore-checksums --ignore-signatures failure"
     expectedCode = 1
 
@@ -75,6 +81,9 @@ class UpdateMirror5Test(BaseTest):
         "aptly mirror create --ignore-signatures failure ${url} hardy main",
     ]
     fixtureWebServer = "test_release2"
+    configOverride = {
+        "downloadRetries": 0,
+    }
     runCmd = "aptly mirror update --ignore-signatures failure"
     expectedCode = 1
 
@@ -90,6 +99,10 @@ class UpdateMirror6Test(BaseTest):
         "aptly mirror create --ignore-signatures failure ${url} hardy main",
     ]
     fixtureWebServer = "test_release2"
+    configOverride = {
+        "downloadRetries": 0,
+    }
+
     runCmd = "aptly mirror update -ignore-checksums --ignore-signatures failure"
 
     def gold_processor(self, gold):
@@ -115,6 +128,8 @@ class UpdateMirror8Test(BaseTest):
     """
     update mirrors: with sources (already in pool)
     """
+
+    skipTest = "Requesting obsolete file - maverick/InRelease"
     fixtureGpg = True
     fixturePool = True
     fixtureCmds = [
@@ -158,6 +173,7 @@ class UpdateMirror11Test(BaseTest):
     """
     update mirrors: update over FTP
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     longTest = False
     fixtureGpg = True
     requiresFTP = True
@@ -175,6 +191,7 @@ class UpdateMirror12Test(BaseTest):
     """
     update mirrors: update with udebs
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     longTest = False
     fixtureGpg = True
     fixtureCmds = [
@@ -218,57 +235,57 @@ class UpdateMirror14Test(BaseTest):
         return "\n".join(sorted(output.split("\n")))
 
 
-# # disabled because https://dl.bintray.com/smira/deb/ seems to be missing
-#
-# class UpdateMirror15Test(BaseTest):
-#     """
-#     update mirrors: update for mirror without MD5 checksums
-#     """
-#     longTest = False
-#     fixtureCmds = [
-#         "aptly mirror create --ignore-signatures bintray https://dl.bintray.com/smira/deb/ ./",
-#     ]
-#     runCmd = "aptly mirror update --ignore-signatures bintray"
+class UpdateMirror15Test(BaseTest):
+    """
+    update mirrors: update for mirror without MD5 checksums
+    """
+    skipTest = "Using deprecated service - bintray"
+    longTest = False
+    fixtureCmds = [
+        "aptly mirror create --ignore-signatures bintray https://dl.bintray.com/smira/deb/ ./",
+    ]
+    runCmd = "aptly mirror update --ignore-signatures bintray"
 
-#     def output_processor(self, output):
-#         return "\n".join(sorted(output.split("\n")))
+    def output_processor(self, output):
+        return "\n".join(sorted(output.split("\n")))
 
-#     def check(self):
-#         super(UpdateMirror15Test, self).check()
-#         # check pool
-#         self.check_exists(
-#             'pool/c7/6b/4bd12fd92e4dfe1b55b18a67a669_libboost-program-options-dev_1.49.0.1_i386.deb')
+    def check(self):
+        super(UpdateMirror15Test, self).check()
+        # check pool
+        self.check_exists(
+            'pool/c7/6b/4bd12fd92e4dfe1b55b18a67a669_libboost-program-options-dev_1.49.0.1_i386.deb')
 
 
-# class UpdateMirror16Test(BaseTest):
-#     """
-#     update mirrors: update for mirror without MD5 checksums but with file in pool on legacy MD5 location
+class UpdateMirror16Test(BaseTest):
+    """
+    update mirrors: update for mirror without MD5 checksums but with file in pool on legacy MD5 location
 
-#     as mirror lacks MD5 checksum, file would be downloaded but not re-imported
-#     """
-#     longTest = False
-#     fixtureCmds = [
-#         "aptly mirror create --ignore-signatures bintray https://dl.bintray.com/smira/deb/ ./",
-#     ]
-#     runCmd = "aptly mirror update --ignore-signatures bintray"
+    as mirror lacks MD5 checksum, file would be downloaded but not re-imported
+    """
+    skipTest = "Using deprecated service - bintray"
+    longTest = False
+    fixtureCmds = [
+        "aptly mirror create --ignore-signatures bintray https://dl.bintray.com/smira/deb/ ./",
+    ]
+    runCmd = "aptly mirror update --ignore-signatures bintray"
 
-#     def output_processor(self, output):
-#         return "\n".join(sorted(output.split("\n")))
+    def output_processor(self, output):
+        return "\n".join(sorted(output.split("\n")))
 
-#     def prepare(self):
-#         super(UpdateMirror16Test, self).prepare()
+    def prepare(self):
+        super(UpdateMirror16Test, self).prepare()
 
-#         os.makedirs(os.path.join(
-#             os.environ["HOME"], ".aptly", "pool", "00", "35"))
+        os.makedirs(os.path.join(
+            os.environ["HOME"], ".aptly", "pool", "00", "35"))
 
-#         shutil.copy(os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "libboost-program-options-dev_1.49.0.1_i386.deb"),
-#                     os.path.join(os.environ["HOME"], ".aptly", "pool", "00", "35"))
+        shutil.copy(os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "libboost-program-options-dev_1.49.0.1_i386.deb"),
+                    os.path.join(os.environ["HOME"], ".aptly", "pool", "00", "35"))
 
-#     def check(self):
-#         super(UpdateMirror16Test, self).check()
-#         # check pool
-#         self.check_not_exists(
-#             'pool/c7/6b/4bd12fd92e4dfe1b55b18a67a669_libboost-program-options-dev_1.49.0.1_i386.deb')
+    def check(self):
+        super(UpdateMirror16Test, self).check()
+        # check pool
+        self.check_not_exists(
+            'pool/c7/6b/4bd12fd92e4dfe1b55b18a67a669_libboost-program-options-dev_1.49.0.1_i386.deb')
 
 
 class UpdateMirror17Test(BaseTest):
@@ -334,6 +351,7 @@ class UpdateMirror19Test(BaseTest):
     """
     update mirrors: correct matching of Release checksums
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     longTest = False
     fixtureGpg = True
     fixtureCmds = [
@@ -366,6 +384,7 @@ class UpdateMirror21Test(BaseTest):
     """
     update mirrors: correct matching of Release checksums (internal pgp implementation)
     """
+    skipTest = "Requesting obsolete file - deb/InRelease"
     longTest = False
     configOverride = {"gpgProvider": "internal"}
     fixtureGpg = True
@@ -398,6 +417,7 @@ class UpdateMirror23Test(BaseTest):
     """
     update mirrors: update with installer
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     longTest = False
     fixtureGpg = True
     fixtureCmds = [
@@ -414,6 +434,7 @@ class UpdateMirror24Test(BaseTest):
     """
     update mirrors: update with installer with separate gpg file
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     longTest = False
     fixtureGpg = True
     fixtureCmds = [
diff --git a/system/t06_publish/snapshot.py b/system/t06_publish/snapshot.py
index 2511b8cb..0e4bdec9 100644
--- a/system/t06_publish/snapshot.py
+++ b/system/t06_publish/snapshot.py
@@ -989,6 +989,7 @@ class PublishSnapshot35Test(BaseTest):
     """
     publish snapshot: mirror with udebs
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     fixtureGpg = True
     fixtureCmds = [
         "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://cdn-fastly.deb.debian.org/debian/ stretch main non-free",
@@ -1145,6 +1146,7 @@ class PublishSnapshot37Test(BaseTest):
     """
     publish snapshot: mirror with double mirror update
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     fixtureGpg = True
     fixtureCmds = [
         "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://cdn-fastly.deb.debian.org/debian/ stretch main non-free",
@@ -1160,6 +1162,7 @@ class PublishSnapshot38Test(BaseTest):
     """
     publish snapshot: mirror with installer
     """
+    skipTest = "Requesting obsolete file - stretch/InRelease"
     fixtureGpg = True
     fixtureCmds = [
         "aptly -architectures=s390x mirror create -keyring=aptlytest.gpg -filter='installer' -with-installer stretch http://cdn-fastly.deb.debian.org/debian/ stretch main",
diff --git a/system/t07_serve/__init__.py b/system/t07_serve/__init__.py
index 143fe756..9d2bfdcd 100644
--- a/system/t07_serve/__init__.py
+++ b/system/t07_serve/__init__.py
@@ -16,6 +16,7 @@ class RootDirInaccessible(BaseTest):
     """
     serve command aborts if rootDir is inaccessible
     """
+    skipTest = 'User is root' if os.environ['USER'] == 'root' else False
     fixtureDB = False
     fixturePool = False
 
diff --git a/system/t12_api/gpg.py b/system/t12_api/gpg.py
index eb995100..6c2e338c 100644
--- a/system/t12_api/gpg.py
+++ b/system/t12_api/gpg.py
@@ -18,6 +18,9 @@ class GPGAPITestAddKey(APITest):
     """
     POST /gpg/key
     """
+
+    skipTest = "Using obsolete keys.gnupg.net"
+
     def check(self):
         with tempfile.NamedTemporaryFile(suffix=".pub") as keyring:
             gpgkeyid = "9E3E53F19C7DE460"
diff --git a/system/t12_api/graph.py b/system/t12_api/graph.py
index 670ada83..ae0fbfd4 100644
--- a/system/t12_api/graph.py
+++ b/system/t12_api/graph.py
@@ -7,6 +7,8 @@ class GraphAPITest(APITest):
     GET /graph.:ext
     """
 
+    requiresDot = True
+
     def check(self):
         resp = self.get("/api/graph.png")
         self.check_equal(resp.headers["Content-Type"], "image/png")
diff --git a/system/t12_api/mirrors.py b/system/t12_api/mirrors.py
index 875e0320..869ec8cd 100644
--- a/system/t12_api/mirrors.py
+++ b/system/t12_api/mirrors.py
@@ -5,6 +5,9 @@ class MirrorsAPITestCreateShow(APITest):
     """
     POST /api/mirrors, GET /api/mirrors/:name/packages
     """
+
+    skipTest = "Using obsolete repo - wheezy/updates"
+
     def check(self):
         mirror_name = self.random_name()
         mirror_desc = {u'Name': mirror_name,
diff --git a/system/t12_api/tasks.py b/system/t12_api/tasks.py
index 9d6a0602..81c9b985 100644
--- a/system/t12_api/tasks.py
+++ b/system/t12_api/tasks.py
@@ -15,11 +15,11 @@ class TaskAPITestParallelTasks(APITest):
         mirror_desc[u'IgnoreSignatures'] = True
         resp = self.post("/api/mirrors", json=mirror_desc)
         self.check_equal(resp.status_code, 201)
-        resp = self.put("/api/mirrors/" + mirror_name, json=mirror_desc)
+        resp = self.put("/api/mirrors/" + mirror_name, json=mirror_desc, params={'_async': True})
         self.check_equal(resp.status_code, 202)
 
         # check that two mirror updates cannot run at the same time
-        resp2 = self.put("/api/mirrors/" + mirror_name, json=mirror_desc)
+        resp2 = self.put("/api/mirrors/" + mirror_name, json=mirror_desc, params={'_async': True})
         self.check_equal(resp2.status_code, 409)
 
         return resp.json()['ID'], mirror_name
@@ -40,7 +40,7 @@ class TaskAPITestParallelTasks(APITest):
                         "pyspi_0.6.1-1.3.diff.gz",
                         "pyspi_0.6.1.orig.tar.gz").status_code, 200)
 
-        resp = self.post("/api/repos/" + repo_name + "/file/" + d)
+        resp = self.post("/api/repos/" + repo_name + "/file/" + d, params={'_async': True})
         self.check_equal(resp.status_code, 202)
 
         return resp.json()['ID'], repo_name
@@ -57,7 +57,7 @@ class TaskAPITestParallelTasks(APITest):
 
     def _snapshot(self, res_type, name):
         uri = "/api/%s/%s/snapshots" % (res_type, name)
-        resp = self.post(uri, json={"Name": name})
+        resp = self.post(uri, json={"Name": name}, params={'_async': True})
         self.check_equal(resp.status_code, 202)
 
         return resp.json()['ID']
@@ -68,7 +68,7 @@ class TaskAPITestParallelTasks(APITest):
                              "SourceKind": source_kind,
                              "Sources": [{"Name": name}],
                              "Signing": DefaultSigningOptions,
-                         })
+                         }, params={'_async': True})
         self.check_equal(resp.status_code, 202)
         return resp.json()['ID']