diff --git a/bin/logdaemon.py b/bin/logdaemon.py
index 1f4cb7b9..9656dcbe 100644
--- a/bin/logdaemon.py
+++ b/bin/logdaemon.py
@@ -5,7 +5,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/__init__.py b/lib/vsc/__init__.py
index 97405393..ecb71f9a 100644
--- a/lib/vsc/__init__.py
+++ b/lib/vsc/__init__.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/__init__.py b/lib/vsc/utils/__init__.py
index 97405393..ecb71f9a 100644
--- a/lib/vsc/utils/__init__.py
+++ b/lib/vsc/utils/__init__.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/affinity.py b/lib/vsc/utils/affinity.py
index fc189442..c9eefa5a 100644
--- a/lib/vsc/utils/affinity.py
+++ b/lib/vsc/utils/affinity.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/dateandtime.py b/lib/vsc/utils/dateandtime.py
index fbb8854c..75c6201e 100644
--- a/lib/vsc/utils/dateandtime.py
+++ b/lib/vsc/utils/dateandtime.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/docs.py b/lib/vsc/utils/docs.py
index 29021278..ae1341c9 100644
--- a/lib/vsc/utils/docs.py
+++ b/lib/vsc/utils/docs.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/exceptions.py b/lib/vsc/utils/exceptions.py
index afec4e41..082dc85d 100644
--- a/lib/vsc/utils/exceptions.py
+++ b/lib/vsc/utils/exceptions.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/fancylogger.py b/lib/vsc/utils/fancylogger.py
index e79ee195..c17e3c7e 100644
--- a/lib/vsc/utils/fancylogger.py
+++ b/lib/vsc/utils/fancylogger.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
@@ -187,7 +187,11 @@ class FancyLogger(logging.getLoggerClass()):
 
     # default class for raiseException method, that can be redefined by deriving loggers
     RAISE_EXCEPTION_CLASS = Exception
-    RAISE_EXCEPTION_LOG_METHOD = lambda c, msg: c.warning(msg)
+
+    def log_method(self, msg):
+        self.warning(msg)
+
+    RAISE_EXCEPTION_LOG_METHOD = log_method
 
     # method definition as it is in logging, can't change this
     def makeRecord(self, name, level, pathname, lineno, msg, args, excinfo, func=None, extra=None):
diff --git a/lib/vsc/utils/generaloption.py b/lib/vsc/utils/generaloption.py
index fcf822b7..3f4f16bd 100644
--- a/lib/vsc/utils/generaloption.py
+++ b/lib/vsc/utils/generaloption.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/mail.py b/lib/vsc/utils/mail.py
index 8e71ef85..60e2f1b3 100644
--- a/lib/vsc/utils/mail.py
+++ b/lib/vsc/utils/mail.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/missing.py b/lib/vsc/utils/missing.py
index 0ddaf31d..80353e8c 100644
--- a/lib/vsc/utils/missing.py
+++ b/lib/vsc/utils/missing.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/patterns.py b/lib/vsc/utils/patterns.py
index d12dfe9f..6a343022 100644
--- a/lib/vsc/utils/patterns.py
+++ b/lib/vsc/utils/patterns.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/rest.py b/lib/vsc/utils/rest.py
index f478dcfa..7dcff2dd 100644
--- a/lib/vsc/utils/rest.py
+++ b/lib/vsc/utils/rest.py
@@ -104,7 +104,7 @@ def __init__(self, url, username=None, password=None, token=None, token_type='To
         elif token is not None:
             self.auth_header = '%s %s' % (token_type, token)
 
-    def get(self, url, headers={}, **params):
+    def get(self, url, headers=None, **params):
         """
         Do a http get request on the given url with given headers and parameters
         Parameters is a dictionary that will will be urlencoded
@@ -114,7 +114,7 @@ def get(self, url, headers={}, **params):
         url += self.urlencode(params)
         return self.request(self.GET, url, None, headers)
 
-    def head(self, url, headers={}, **params):
+    def head(self, url, headers=None, **params):
         """
         Do a http head request on the given url with given headers and parameters
         Parameters is a dictionary that will will be urlencoded
@@ -124,7 +124,7 @@ def head(self, url, headers={}, **params):
         url += self.urlencode(params)
         return self.request(self.HEAD, url, None, headers)
 
-    def delete(self, url, headers={}, **params):
+    def delete(self, url, headers=None, **params):
         """
         Do a http delete request on the given url with given headers and parameters
         Parameters is a dictionary that will will be urlencoded
@@ -134,7 +134,7 @@ def delete(self, url, headers={}, **params):
         url += self.urlencode(params)
         return self.request(self.DELETE, url, None, headers)
 
-    def post(self, url, body=None, headers={}, **params):
+    def post(self, url, body=None, headers=None, **params):
         """
         Do a http post request on the given url with given body, headers and parameters
         Parameters is a dictionary that will will be urlencoded
@@ -145,7 +145,7 @@ def post(self, url, body=None, headers={}, **params):
         headers['Content-Type'] = 'application/json'
         return self.request(self.POST, url, json.dumps(body), headers)
 
-    def put(self, url, body=None, headers={}, **params):
+    def put(self, url, body=None, headers=None, **params):
         """
         Do a http put request on the given url with given body, headers and parameters
         Parameters is a dictionary that will will be urlencoded
@@ -156,7 +156,7 @@ def put(self, url, body=None, headers={}, **params):
         headers['Content-Type'] = 'application/json'
         return self.request(self.PUT, url, json.dumps(body), headers)
 
-    def patch(self, url, body=None, headers={}, **params):
+    def patch(self, url, body=None, headers=None, **params):
         """
         Do a http patch request on the given url with given body, headers and parameters
         Parameters is a dictionary that will will be urlencoded
@@ -168,6 +168,9 @@ def patch(self, url, body=None, headers={}, **params):
         return self.request(self.PATCH, url, json.dumps(body), headers)
 
     def request(self, method, url, body, headers):
+        """Low-level networking. All HTTP-method methods call this"""
+        if headers is None:
+            headers = {}
         if self.auth_header is not None:
             headers['Authorization'] = self.auth_header
         headers['User-Agent'] = self.user_agent
diff --git a/lib/vsc/utils/run.py b/lib/vsc/utils/run.py
index 35fe86a8..dfe2b0f2 100644
--- a/lib/vsc/utils/run.py
+++ b/lib/vsc/utils/run.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/lib/vsc/utils/testing.py b/lib/vsc/utils/testing.py
index 693c3d1a..1e0412ba 100644
--- a/lib/vsc/utils/testing.py
+++ b/lib/vsc/utils/testing.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/setup.py b/setup.py
index 8ea2cae0..c4c51096 100755
--- a/setup.py
+++ b/setup.py
@@ -36,10 +36,10 @@
 import vsc.install.shared_setup as shared_setup
 from vsc.install.shared_setup import ag, kh, jt, sdw
 
-VSC_INSTALL_REQ_VERSION = '0.9.19'
+VSC_INSTALL_REQ_VERSION = '0.10.1'
 
 PACKAGE = {
-    'version': '2.4.18',
+    'version': '2.5.0',
     'author': [sdw, jt, ag, kh],
     'maintainer': [sdw, jt, ag, kh],
     # as long as 1.0.0 is not out, vsc-base should still provide vsc.fancylogger
diff --git a/test/00-import.py b/test/00-import.py
index dd33173e..695a80da 100644
--- a/test/00-import.py
+++ b/test/00-import.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
@@ -23,4 +23,5 @@
 # You should have received a copy of the GNU Library General Public License
 # along with vsc-base. If not, see <http://www.gnu.org/licenses/>.
 #
+#
 from vsc.install.commontest import CommonTest
diff --git a/test/__init__.py b/test/__init__.py
index 8b137891..e1eea6c0 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1 +1,26 @@
+#
+# Copyright 2016-2016 Ghent University
+#
+# This file is part of vsc-base,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# https://github.com/hpcugent/vsc-base
+#
+# vsc-base is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation, either version 2 of
+# the License, or (at your option) any later version.
+#
+# vsc-base is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with vsc-base. If not, see <http://www.gnu.org/licenses/>.
+#
 
diff --git a/test/asyncprocess.py b/test/asyncprocess.py
index 1941f0dd..658134d3 100644
--- a/test/asyncprocess.py
+++ b/test/asyncprocess.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/dateandtime.py b/test/dateandtime.py
index af928ce5..3b64d693 100644
--- a/test/dateandtime.py
+++ b/test/dateandtime.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/docs.py b/test/docs.py
index 70626f64..9f247fc3 100644
--- a/test/docs.py
+++ b/test/docs.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/exceptions.py b/test/exceptions.py
index 837491da..5daeac25 100644
--- a/test/exceptions.py
+++ b/test/exceptions.py
@@ -5,7 +5,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/fancylogger.py b/test/fancylogger.py
index 96ee327b..69b70a66 100644
--- a/test/fancylogger.py
+++ b/test/fancylogger.py
@@ -5,7 +5,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/generaloption.py b/test/generaloption.py
index f113355f..fa10614f 100644
--- a/test/generaloption.py
+++ b/test/generaloption.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
@@ -41,7 +41,7 @@
 from vsc.utils.missing import shell_quote, shell_unquote
 from vsc.utils.optcomplete import gen_cmdline
 from vsc.utils.run import run_simple
-from vsc.install.shared_setup import REPO_BASE_DIR
+from vsc.install.shared_setup import vsc_setup
 from vsc.install.testing import TestCase
 
 
@@ -117,6 +117,10 @@ def ext_options(self):
 class GeneralOptionTest(TestCase):
     """Tests for general option"""
 
+    def setUp(self):
+        super(GeneralOptionTest, self).setUp()
+        self.setup = vsc_setup()
+
     def test_help_short(self):
         """Generate short help message"""
         topt = TestOption1(go_args=['-h'],
@@ -685,7 +689,7 @@ def test_optcomplete(self):
         partial = '-'
         cmd_list = [script, partial]
 
-        pythonpath = 'PYTHONPATH=%s' % os.pathsep.join([p for p in sys.path if p.startswith(REPO_BASE_DIR)])
+        pythonpath = 'PYTHONPATH=%s' % os.pathsep.join([p for p in sys.path if p.startswith(self.setup.REPO_BASE_DIR)])
         ec, out = run_simple('%s %s; test $? == 1' % (pythonpath, gen_cmdline(cmd_list, partial, shebang=False)))
         # tabcompletion ends with exit 1!; test returns this to 0
         # avoids run.log.error message
diff --git a/test/missing.py b/test/missing.py
index 50258694..686cd759 100644
--- a/test/missing.py
+++ b/test/missing.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/optcomplete.py b/test/optcomplete.py
index 94b213fb..0007f592 100644
--- a/test/optcomplete.py
+++ b/test/optcomplete.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/rest.py b/test/rest.py
index dc765fe2..1c3bfc71 100644
--- a/test/rest.py
+++ b/test/rest.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/run.py b/test/run.py
index 68890d84..9e2dbc07 100644
--- a/test/run.py
+++ b/test/run.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/runtests/qa.py b/test/runtests/qa.py
index a74b48a0..ba7d6048 100755
--- a/test/runtests/qa.py
+++ b/test/runtests/qa.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/runtests/simple.py b/test/runtests/simple.py
index 98200f93..f4d8bdc8 100755
--- a/test/runtests/simple.py
+++ b/test/runtests/simple.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/runtests/simple_option.py b/test/runtests/simple_option.py
index e31d9ab1..d74f1604 100755
--- a/test/runtests/simple_option.py
+++ b/test/runtests/simple_option.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/sandbox/testpkg/__init__.py b/test/sandbox/testpkg/__init__.py
index 3db9d71d..4b6e9f24 100644
--- a/test/sandbox/testpkg/__init__.py
+++ b/test/sandbox/testpkg/__init__.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
@@ -23,3 +23,4 @@
 # You should have received a copy of the GNU Library General Public License
 # along with vsc-base. If not, see <http://www.gnu.org/licenses/>.
 #
+#
diff --git a/test/sandbox/testpkg/testmodule.py b/test/sandbox/testpkg/testmodule.py
index daf7fae2..5536f3ad 100644
--- a/test/sandbox/testpkg/testmodule.py
+++ b/test/sandbox/testpkg/testmodule.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/sandbox/testpkg/testmodulebis.py b/test/sandbox/testpkg/testmodulebis.py
index f076b369..14e21802 100644
--- a/test/sandbox/testpkg/testmodulebis.py
+++ b/test/sandbox/testpkg/testmodulebis.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/testing.py b/test/testing.py
index edfa260c..91fc7e43 100644
--- a/test/testing.py
+++ b/test/testing.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
diff --git a/test/wrapper.py b/test/wrapper.py
index dd05e53a..573bb74a 100644
--- a/test/wrapper.py
+++ b/test/wrapper.py
@@ -4,7 +4,7 @@
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
 # the Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #