diff --git a/src/pystencils/datahandling/serial_datahandling.py b/src/pystencils/datahandling/serial_datahandling.py
index 4eb341df52b93050efef3791d32939fb33d31883..ba705f4b9f665ea9eaf81ad42863196c25901df8 100644
--- a/src/pystencils/datahandling/serial_datahandling.py
+++ b/src/pystencils/datahandling/serial_datahandling.py
@@ -344,11 +344,11 @@ class SerialDataHandling(DataHandling):
         if target == Target.CPU:
             def result_functor():
                 for arr_name, func in zip(names, result):
-                    func(pdfs=self.cpu_arrays[arr_name])
+                    func(self.cpu_arrays[arr_name])
         else:
             def result_functor():
                 for arr_name, func in zip(names, result):
-                    func(pdfs=self.gpu_arrays[arr_name])
+                    func(self.gpu_arrays[arr_name])
 
         return result_functor
 
diff --git a/src/pystencils/runhelper/db.py b/src/pystencils/runhelper/db.py
index 466b9dc14cbc05a18fb895fd7b83b979fddde185..dd413a5e405771822d36611d1068936b74ee334c 100644
--- a/src/pystencils/runhelper/db.py
+++ b/src/pystencils/runhelper/db.py
@@ -8,7 +8,7 @@ import six
 from blitzdb.backends.file.backend import serializer_classes
 from blitzdb.backends.file.utils import JsonEncoder
 
-from pystencils.cpu.cpujit import get_compiler_config
+from pystencils.backend.jit.legacy_cpu import get_compiler_config
 from pystencils import CreateKernelConfig, Target, Field
 
 import json
diff --git a/tests/runtime/test_datahandling.py b/tests/runtime/test_datahandling.py
index 90c21db18bec991eb0350fe5ad2ebaf61f5fa2fc..29e639c88c050b816fded2bdadef6af5a28b69ee 100644
--- a/tests/runtime/test_datahandling.py
+++ b/tests/runtime/test_datahandling.py
@@ -408,6 +408,3 @@ def test_array_handler(device_number):
     assert cpu_array2.base is not None
     assert gpu_array2.base is not None
     assert gpu_array2.strides == cpu_array2.strides
-
-
-test_access_and_gather()