diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
index 44e89a6cb2c8f3c1c1ddba17a2b94e3e34236e7e..23a8f8a8063e447012077f6cbade2e6a8419a496 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
@@ -165,9 +165,8 @@ class SDP(opcua_device):
     FPGA_jesd204b_rx_err1_R = attribute_wrapper(comms_annotation=["FPGA_jesd204b_rx_err1_R"], datatype=numpy.uint32, dims=(S_pn, N_pn))
 
     FPGA_signal_input_bsn_R = attribute_wrapper(comms_annotation=["FPGA_signal_input_bsn_R"], datatype=numpy.int64, dims=(N_pn,))
-    FPGA_signal_input_nof_blocks_R = attribute_wrapper(comms_annotation=["FPGA_signal_input_nof_blocks_R"], datatype=numpy.int32, dims=(N_pn,))
+    FPGA_signal_input_nof_packets_R = attribute_wrapper(comms_annotation=["FPGA_signal_input_nof_packets_R"], datatype=numpy.int32, dims=(N_pn,))
     FPGA_signal_input_nof_samples_R = attribute_wrapper(comms_annotation=["FPGA_signal_input_nof_samples_R"], datatype=numpy.int32, dims=(N_pn,))
-    FPGA_signal_input_nof_err_R = attribute_wrapper(comms_annotation=["FPGA_signal_input_nof_err_R"], datatype=numpy.int32, dims=(N_pn,))
     FPGA_signal_input_samples_delay_R = attribute_wrapper(comms_annotation=["FPGA_signal_input_samples_delay_R"], datatype=numpy.uint32, dims=(S_pn, N_pn))
     FPGA_signal_input_samples_delay_RW = attribute_wrapper(comms_annotation=["FPGA_signal_input_samples_delay_RW"], datatype=numpy.uint32, dims=(S_pn, N_pn), access=AttrWriteType.READ_WRITE)
 
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_lofar_device.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_lofar_device.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/integration_test/devices/test_lofar_device.py
rename to tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_lofar_device.py
index d5a935eb537a9031ee67b2252ba1b1cfd1eb6687..3a420bbd3c3f03b34d4664f39d631de154c69bd0 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_lofar_device.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_lofar_device.py
@@ -13,6 +13,7 @@ from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
 
 from tangostationcontrol.integration_test import base
 
+
 class TestProxyAttributeAccess(base.IntegrationTestCase):
     """ Test whether DeviceProxy's can always access attributes immediately after turning them on. """
 
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/toolkit/__init__.py b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/__init__.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/integration_test/toolkit/__init__.py
rename to tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/__init__.py
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/toolkit/test_archiver.py b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/integration_test/toolkit/test_archiver.py
rename to tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py
index a6c361435cd953616bbd5cdf9514b2550a9e824a..2c9fc2650489cc2c04908b333c1a0bfcefed1d89 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/toolkit/test_archiver.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py
@@ -16,6 +16,7 @@ from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
 import time
 from datetime import datetime
 
+
 class TestArchiver(BaseIntegrationTestCase):
 
     def setUp(self):
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/toolkit/test_archiver_util.py b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver_util.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/integration_test/toolkit/test_archiver_util.py
rename to tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver_util.py
index ad4595951d43c5cacdf26459e9cb982c1e32e142..952e665674d2bcb79e8a393a33c62a6144ec9125 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/toolkit/test_archiver_util.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver_util.py
@@ -14,6 +14,7 @@ from tango import DevState
 import json
 import pkg_resources
 
+
 class TestArchiverUtil(BaseIntegrationTestCase):
 
     def setUp(self):