diff --git a/tangostationcontrol/tangostationcontrol/devices/lofar_device.py b/tangostationcontrol/tangostationcontrol/devices/lofar_device.py
index 524ea85f026c9e04e446611eeeaa8684bdfc06b4..36f2ffb11b117f4975bfa5ff4bcbbc244a26f202 100644
--- a/tangostationcontrol/tangostationcontrol/devices/lofar_device.py
+++ b/tangostationcontrol/tangostationcontrol/devices/lofar_device.py
@@ -199,6 +199,7 @@ class lofar_device(Device, metaclass=DeviceMeta):
             elif not mask[idx]:
                 merge_values[idx] = current_values[idx]
 
+    @command()
     def store_coverage(self):
         try:
             self.cov.stop()
@@ -206,6 +207,8 @@ class lofar_device(Device, metaclass=DeviceMeta):
             logger.info("Stopped code coverage measurements")
         except Exception:
             pass
+
+    @command()
     def start_coverage(self):
         try:
             import os
@@ -213,24 +216,25 @@ class lofar_device(Device, metaclass=DeviceMeta):
             import coverage
 
             self.cov = coverage.Coverage(
+                config_file=os.getcwd() + "/tangostationcontrol/.coveragerc",
                 data_file=os.getcwd() + "/tangostationcontrol/.coverage",
-                data_suffix=True,
-                branch=True,
-                source=os.getcwd() + "/tangostationcontrol/tangostationcontrol"
+                data_suffix=True
+                # branch=True,
+                # source=os.getcwd() + "/tangostationcontrol/tangostationcontrol"
             )
             self.cov.start()
             logger.info("Started code coverage measurements: %s", os.getcwd())
 
             atexit.register(self.store_coverage)
         except Exception as e:
-            logger.warning("Could not configure for code coverage: %s", e)
+            logger.exception("Could not configure for code coverage: %s", e)
 
     @log_exceptions()
     def init_device(self):
         """ Instantiates the device in the OFF state. """
 
-        if constants.DEBUG:
-            self.start_coverage()
+        # if constants.DEBUG:
+        #     self.start_coverage()
 
         # NOTE: Will delete_device first, if necessary
         Device.init_device(self)