diff --git a/src/common/tests/MockServicerImpl_Context.py b/src/common/tests/MockServicerImpl_Context.py
index c56ed382adad4b2daa2e3d61575d2973f02bfbe2..27ff45fc58c675fe28090a186059244e2f1178c1 100644
--- a/src/common/tests/MockServicerImpl_Context.py
+++ b/src/common/tests/MockServicerImpl_Context.py
@@ -115,7 +115,7 @@ class MockServicerImpl_Context(ContextServiceServicer):
 
     def SetContext(self, request: Context, context : grpc.ServicerContext) -> ContextId:
         LOGGER.info('[SetContext] request={:s}'.format(grpc_message_to_json_string(request)))
-        return self._set(request, 'context', request.context_uuid.uuid, 'context_id', TOPIC_CONTEXT)
+        return self._set(request, 'context', request.context_id.context_uuid.uuid, 'context_id', TOPIC_CONTEXT)
 
     def RemoveContext(self, request: ContextId, context : grpc.ServicerContext) -> Empty:
         LOGGER.info('[RemoveContext] request={:s}'.format(grpc_message_to_json_string(request)))
@@ -233,17 +233,19 @@ class MockServicerImpl_Context(ContextServiceServicer):
 
     def SetSlice(self, request: Slice, context : grpc.ServicerContext) -> SliceId:
         LOGGER.info('[SetSlice] request={:s}'.format(grpc_message_to_json_string(request)))
-        return set_entry(
-            self.database, 'slice[{:s}]'.format(str(request.slice_id.context_id.context_uuid.uuid)),
-            request.slice_id.slice_uuid.uuid, request).slice_id
+        container_name = 'slice[{:s}]'.format(str(request.slice_id.context_id.context_uuid.uuid))
+        slice_uuid = request.slice_id.slice_uuid.uuid
+        return self._set(request, container_name, slice_uuid, 'slice_id', TOPIC_SLICE)
 
     def RemoveSlice(self, request: SliceId, context : grpc.ServicerContext) -> Empty:
         LOGGER.info('[RemoveSlice] request={:s}'.format(grpc_message_to_json_string(request)))
         container_name = 'slice[{:s}]'.format(str(request.context_id.context_uuid.uuid))
-        return del_entry(context, self.database, container_name, request.slice_uuid.uuid)
+        slice_uuid = request.slice_uuid.uuid
+        return self._del(request, container_name, slice_uuid, 'slice_id', TOPIC_SLICE, context)
 
     def GetSliceEvents(self, request: Empty, context : grpc.ServicerContext) -> Iterator[SliceEvent]:
         LOGGER.info('[GetSliceEvents] request={:s}'.format(grpc_message_to_json_string(request)))
+        for message in self.msg_broker.consume({TOPIC_SLICE}): yield SliceEvent(**json.loads(message.content))
 
 
     # ----- Service ----------------------------------------------------------------------------------------------------
@@ -272,7 +274,7 @@ class MockServicerImpl_Context(ContextServiceServicer):
     def RemoveService(self, request: ServiceId, context : grpc.ServicerContext) -> Empty:
         LOGGER.info('[RemoveService] request={:s}'.format(grpc_message_to_json_string(request)))
         container_name = 'service[{:s}]'.format(str(request.context_id.context_uuid.uuid))
-        service_uuid = request.service_id.service_uuid.uuid
+        service_uuid = request.service_uuid.uuid
         return self._del(request, container_name, service_uuid, 'service_id', TOPIC_SERVICE, context)
 
     def GetServiceEvents(self, request: Empty, context : grpc.ServicerContext) -> Iterator[ServiceEvent]: