diff --git a/LCU/Maintenance/MDB_tools/cli/mdb_loader.py b/LCU/Maintenance/MDB_tools/cli/mdb_loader.py
index 9b6b674be93d8d3de0a4e04f0f75052b915e54fd..dfa2494f37c312c217a7e65eb243678e3a9b0f35 100755
--- a/LCU/Maintenance/MDB_tools/cli/mdb_loader.py
+++ b/LCU/Maintenance/MDB_tools/cli/mdb_loader.py
@@ -1,15 +1,14 @@
 #! /usr/bin/env python
-import logging
 import argparse
-import requests
+import logging
+import re
 import sys
-import json
 from glob import glob
-import os
-import re
+from os.path import isfile
 
+import requests
 
-logger = logging.getLogger('probe_mdb')
+logger = logging.getLogger('mdb_loader')
 
 """
 This program is meant to load the station tests and RTSM present in a certain directory to the database
@@ -36,7 +35,7 @@ def obtain_file_list(path):
     :return:
     """
     logger.info('listing file in %s', path)
-    file_list = filter(os.path.isfile, glob(path))
+    file_list = list(filter(isfile, glob(path)))
     logger.debug('found files: %s', file_list)
     return file_list
 
diff --git a/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py b/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
index d1cad4d8135c638ba3a00178c442547d022e8907..c2e03cc28ff36d9e61769d6df908dd5025c763c4 100644
--- a/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
+++ b/LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
@@ -1,5 +1,7 @@
 import unittest
+
 from mock import patch, MagicMock, Mock
+
 from lofar.maintenance.utils.cli.mdb_loader import *
 
 logger = logging.getLogger(__name__)
@@ -78,13 +80,12 @@ class TESTMDBLoader(unittest.TestCase):
         with self.assertRaises(ValueError):
             create_query_string(is_station_test=False, is_rtsm=False)
 
-    @patch('os.path.isfile')
+    @patch('lofar.maintenance.utils.cli.mdb_loader.isfile')
     @patch('lofar.maintenance.utils.cli.mdb_loader.glob')
     def test_obtain_file_path_list(self, glob_mock, isfile_mock):
         path = 'test'
         glob_return_values = ['test', 'test1', 'test2']
         glob_mock.return_value = glob_return_values
-
         obtain_file_list(path)
         glob_mock.assert_called_with(path)
         self.assertEqual(isfile_mock.call_count, 3)