diff --git a/oar/kao/kao.py b/oar/kao/kao.py
index eba546e8..fc322cbf 100755
--- a/oar/kao/kao.py
+++ b/oar/kao/kao.py
@@ -10,7 +10,6 @@
 
 def main():
     logger.info("Starting Kao Meta Scheduler")
-    import pdb; pdb.set_trace()
     meta_schedule()
 
 if __name__ == '__main__':  # pragma: no cover
diff --git a/oar/modules/bipbip_commander.py b/oar/modules/bipbip_commander.py
index 2f83ed4c..ff72f0c3 100644
--- a/oar/modules/bipbip_commander.py
+++ b/oar/modules/bipbip_commander.py
@@ -32,7 +32,7 @@
 # Set undefined config value to default one
 DEFAULT_CONFIG = {
     'SERVER_HOSTNAME': 'localhost',
-    'ZMQ_SERVER_PORT': '6667',
+    'APPENDICE_SERVER_PORT': '6668',
     'BIPBIP_COMMANDER_SERVER': 'localhost',
     'BIPBIP_COMMANDER_PORT': '6669',
     'MAX_CONCURRENT_JOBS_STARTING_OR_TERMINATING': '25',
@@ -68,7 +68,7 @@ def __init__(self):
         # Initialize a zeromq context
         self.context = zmq.Context()
         self.appendice = self.context.socket(zmq.PUSH) # to signal Almighty
-        self.appendice.connect('tcp://' + config['SERVER_HOSTNAME'] + ':' + config['ZMQ_SERVER_PORT'])
+        self.appendice.connect('tcp://' + config['SERVER_HOSTNAME'] + ':' + config['APPENDICE_SERVER_PORT'])
 
 
         # IP addr is required when bind function is used on zmq socket
diff --git a/tests/modules/test_almighty.py b/tests/modules/test_almighty.py
index 7fe7050b..d4c4e4ba 100644
--- a/tests/modules/test_almighty.py
+++ b/tests/modules/test_almighty.py
@@ -28,15 +28,15 @@ def monkeypatch_tools(request, monkeypatch):
 
 @pytest.fixture(scope="function", autouse=True)
 def setup(request):
-    config['ZMQ_SERVER_PORT'] = '6667'
-    config['APPENDICE_PROXY_SERVER_PORT'] = '6668'
-    
+    config['SERVER_HOSTNAME'] = 'localhost'
+    config['APPENDICE_SERVER_PORT'] = '6668'
     config['BIPBIP_COMMANDER_SERVER'] = 'localhost'
     config['BIPBIP_COMMANDER_PORT'] = '6669'
 
     @request.addfinalizer
     def teardown():
-        del config['ZMQ_SERVER_PORT']
+        del config['SERVER_HOSTNAME']
+        del config['APPENDICE_SERVER_PORT']  
         del config['BIPBIP_COMMANDER_SERVER']
         del config['BIPBIP_COMMANDER_PORT']
         FakeZmq.i = 0
diff --git a/tests/modules/test_appendice_proxy.py b/tests/modules/test_appendice_proxy.py
index 0e91cad0..e2f8b38e 100644
--- a/tests/modules/test_appendice_proxy.py
+++ b/tests/modules/test_appendice_proxy.py
@@ -13,13 +13,15 @@ def monkeypatch_tools(request, monkeypatch):
 
 @pytest.fixture(scope="function", autouse=True)
 def setup(request):
-    config['APPENDICE_PROXY_SERVER_PORT'] = '6668'
+    config['SERVER_HOSTNAME'] = 'localhost'
+    config['APPENDICE_SERVER_PORT'] = '6668'
     config['BIPBIP_COMMANDER_SERVER'] = 'localhost'
     config['BIPBIP_COMMANDER_PORT'] = '6669'
 
     @request.addfinalizer
     def teardown():
-        del config['APPENDICE_PROXY_SERVER_PORT']
+        del config['SERVER_HOSTNAME']
+        del config['APPENDICE_SERVER_PORT']  
         del config['BIPBIP_COMMANDER_SERVER']
         del config['BIPBIP_COMMANDER_PORT']
         FakeZmq.i = 0
diff --git a/tests/modules/test_bipbip_commander.py b/tests/modules/test_bipbip_commander.py
index 5fcebe7c..68a92f9f 100644
--- a/tests/modules/test_bipbip_commander.py
+++ b/tests/modules/test_bipbip_commander.py
@@ -24,13 +24,15 @@ def monkeypatch_tools(request, monkeypatch):
 
 @pytest.fixture(scope="function", autouse=True)
 def setup(request):
-    config['ZMQ_SERVER_PORT'] = '6667'
+    config['SERVER_HOSTNAME'] = 'localhost'
+    config['APPENDICE_SERVER_PORT'] = '6668'
     config['BIPBIP_COMMANDER_SERVER'] = 'localhost'
     config['BIPBIP_COMMANDER_PORT'] = '6669'
 
     @request.addfinalizer
     def teardown():
-        del config['ZMQ_SERVER_PORT']
+        del config['SERVER_HOSTNAME']
+        del config['APPENDICE_SERVER_PORT']  
         del config['BIPBIP_COMMANDER_SERVER']
         del config['BIPBIP_COMMANDER_PORT']
         FakeZmq.i = 0