diff --git a/fileserver/requirements.txt b/fileserver/requirements.txt
index 2077213..5dd231f 100644
--- a/fileserver/requirements.txt
+++ b/fileserver/requirements.txt
@@ -1 +1,2 @@
-Flask
\ No newline at end of file
+Flask
+pyhocon>=0.3.35
\ No newline at end of file
diff --git a/server/bll/event/event_bll.py b/server/bll/event/event_bll.py
index b0f9ace..1725ae9 100644
--- a/server/bll/event/event_bll.py
+++ b/server/bll/event/event_bll.py
@@ -285,7 +285,7 @@ class EventBLL(object):
                 es_res = self.es.search(index=es_index, body=es_req, scroll="1h")
 
         events = [hit["_source"] for hit in es_res["hits"]["hits"]]
-        next_scroll_id = es_res["_scroll_id"]
+        next_scroll_id = es_res.get("_scroll_id")
         total_events = es_res["hits"]["total"]
 
         return events, next_scroll_id, total_events
@@ -365,7 +365,7 @@ class EventBLL(object):
                 )
 
         events = [doc["_source"] for doc in es_res.get("hits", {}).get("hits", [])]
-        next_scroll_id = es_res["_scroll_id"]
+        next_scroll_id = es_res.get("_scroll_id")
         total_events = es_res["hits"]["total"]
 
         return TaskEventsResult(
diff --git a/server/requirements.txt b/server/requirements.txt
index eef76dd..babd344 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -25,3 +25,4 @@ validators>=0.12.4
 fastjsonschema>=2.8
 boltons>=19.1.0
 semantic_version>=2.6.0,<3
+furl>=2.0.0
diff --git a/server/tests/automated/task_events_tests.py b/server/tests/automated/task_events_tests.py
index a62dc8d..130f472 100644
--- a/server/tests/automated/task_events_tests.py
+++ b/server/tests/automated/task_events_tests.py
@@ -5,16 +5,16 @@ import json
 import unittest
 
 import es_factory
-from tests.api_client import APIClient
 from config import config
+from tests.automated import TestService
 
 log = config.logger(__file__)
 
 
-class TestDatasetsService(unittest.TestCase):
+class TestDatasetsService(TestService):
 
-    def setUp(self):
-        self.api = APIClient(base_url="http://localhost:5100/v1.0")
+    def setUp(self, version="1.0"):
+        super(TestDatasetsService, self).setUp(version=version)
         self.created_tasks = []
 
         self.task = dict(
diff --git a/server/tests/requirements.txt b/server/tests/requirements.txt
index 6d831c0..7eb0932 100644
--- a/server/tests/requirements.txt
+++ b/server/tests/requirements.txt
@@ -1 +1,2 @@
 numpy>=1.12.1
+parameterized>=0.7.0
diff --git a/webserver/requirements.txt b/webserver/requirements.txt
index d54cd04..5245639 100644
--- a/webserver/requirements.txt
+++ b/webserver/requirements.txt
@@ -1,5 +1,4 @@
 Jinja2>=2.9.6
-setuptools>=33,<34
 requests>=2.0
 Werkzeug==0.12.2
 Flask==0.12.2