diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b24967d..8f1bc2e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="074a7b9f-21fd-45f6-aa15-f5a6bf462e5e" name="Default" comment="" />
+    <list default="true" id="074a7b9f-21fd-45f6-aa15-f5a6bf462e5e" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mock/event_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/mock/event_service.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mock/event_service_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/mock/event_service_test.go" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -11,9 +15,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor" />
+      <file leaf-file-name="network_manager_test.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mock/network_manager_test.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="258">
+              <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="event_service_test.go" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/mock/event_service_test.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="418">
+              <caret line="31" column="30" selection-start-line="31" selection-start-column="30" selection-end-line="31" selection-end-column="30" />
+            </state>
+          </provider>
         </entry>
       </file>
     </leaf>
@@ -45,6 +62,10 @@
       <find>timeout cha</find>
       <find>failed</find>
       <find>channel</find>
+      <find>time.a</find>
+      <find>sleep</find>
+      <find>time.se</find>
+      <find>eventSer</find>
     </findStrings>
     <replaceStrings>
       <replace>GrpcCommandHandlers</replace>
@@ -77,12 +98,12 @@
         <option value="$PROJECT_DIR$/mock/process.go" />
         <option value="$PROJECT_DIR$/mock/process_test.go" />
         <option value="$PROJECT_DIR$/test/total_test.go" />
-        <option value="$PROJECT_DIR$/mock/event_service_test.go" />
         <option value="$PROJECT_DIR$/mock/network_manager_test.go" />
         <option value="$PROJECT_DIR$/mock/network_manager.go" />
-        <option value="$PROJECT_DIR$/mock/event_service.go" />
         <option value="$PROJECT_DIR$/.gitignore.go" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/mock/event_service.go" />
+        <option value="$PROJECT_DIR$/mock/event_service_test.go" />
       </list>
     </option>
   </component>
@@ -113,6 +134,11 @@
               <item name="avengers" type="b2602c69:ProjectViewProjectNode" />
               <item name="avengers" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="avengers" type="b2602c69:ProjectViewProjectNode" />
+              <item name="avengers" type="462c0819:PsiDirectoryNode" />
+              <item name="mock" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="avengers" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
@@ -152,7 +178,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Go Test.TestNetworkManager_Start in github.com/it-chain/avengers/mock">
+  <component name="RunManager" selected="Go Test.TestEventService_Publish in github.com/it-chain/avengers/mock">
     <configuration name="TestEventService_Publish in github.com/it-chain/avengers/mock" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
       <module name="avengers" />
       <working_directory value="$PROJECT_DIR$/mock" />
@@ -215,8 +241,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Go Test.TestNetworkManager_Start in github.com/it-chain/avengers/mock" />
         <item itemvalue="Go Test.TestEventService_Publish in github.com/it-chain/avengers/mock" />
+        <item itemvalue="Go Test.TestNetworkManager_Start in github.com/it-chain/avengers/mock" />
         <item itemvalue="Go Test.TestNetworkManager_Publish in github.com/it-chain/avengers/mock" />
         <item itemvalue="Go Test.network_manager_test.go" />
         <item itemvalue="Go Test.TestProcess_RegisterHandler in github.com/it-chain/avengers/mock" />
@@ -224,9 +250,6 @@
     </recent_temporary>
   </component>
   <component name="TestHistory">
-    <history-entry file="TestNetworkManager_Start_in_github_com_it-chain_avengers_mock - 2018.09.16 at 10h 02m 31s.xml">
-      <configuration name="TestNetworkManager_Start in github.com/it-chain/avengers/mock" configurationId="GoTestRunConfiguration" />
-    </history-entry>
     <history-entry file="TestNetworkManager_Start_in_github_com_it-chain_avengers_mock - 2018.09.16 at 10h 03m 48s.xml">
       <configuration name="TestNetworkManager_Start in github.com/it-chain/avengers/mock" configurationId="GoTestRunConfiguration" />
     </history-entry>
@@ -254,6 +277,9 @@
     <history-entry file="TestNetworkManager_Start_in_github_com_it-chain_avengers_mock - 2018.09.16 at 15h 08m 58s.xml">
       <configuration name="TestNetworkManager_Start in github.com/it-chain/avengers/mock" configurationId="GoTestRunConfiguration" />
     </history-entry>
+    <history-entry file="TestEventService_Publish_in_github_com_it-chain_avengers_mock - 2018.10.06 at 14h 40m 12s.xml">
+      <configuration name="TestEventService_Publish in github.com/it-chain/avengers/mock" configurationId="GoTestRunConfiguration" />
+    </history-entry>
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
@@ -263,11 +289,12 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32923076" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.25025642" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.25025642" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.21128204" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.21128204" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -276,7 +303,6 @@
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32923076" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -499,36 +525,36 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mock/network_manager_test.go">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mock/network_manager.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="549">
-          <caret line="176" lean-forward="true" selection-start-line="176" selection-end-line="176" />
+        <state relative-caret-position="463">
+          <caret line="92" column="17" lean-forward="true" selection-start-line="92" selection-start-column="17" selection-end-line="92" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mock/event_service_test.go">
+    <entry file="file://$PROJECT_DIR$/mock/network_manager_test.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="8" column="2" lean-forward="true" selection-start-line="8" selection-start-column="2" selection-end-line="8" selection-end-column="2" />
+        <state relative-caret-position="258">
+          <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mock/network_manager.go">
+    <entry file="file://$PROJECT_DIR$/mock/event_service.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="577">
-          <caret line="147" column="31" selection-start-line="147" selection-start-column="31" selection-end-line="147" selection-end-column="31" />
+        <state relative-caret-position="491">
+          <caret line="54" column="35" selection-start-line="54" selection-start-column="35" selection-end-line="54" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mock/event_service.go">
+    <entry file="file://$PROJECT_DIR$/mock/event_service_test.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="684">
-          <caret line="47" column="14" lean-forward="true" selection-start-line="47" selection-start-column="14" selection-end-line="47" selection-end-column="14" />
+        <state relative-caret-position="418">
+          <caret line="31" column="30" selection-start-line="31" selection-start-column="30" selection-end-line="31" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/mock/event_service.go b/mock/event_service.go
index c2c0274..12116bd 100644
--- a/mock/event_service.go
+++ b/mock/event_service.go
@@ -19,6 +19,7 @@ package mock
 import (
 	"errors"
 	"reflect"
+	"time"
 )
 
 var ErrEventType = errors.New("Error type of event is not struct")
@@ -26,17 +27,20 @@ var ErrEventType = errors.New("Error type of event is not struct")
 type EventService struct {
 	ProcessId   string
 	PublishFunc func(processId string, topic string, event interface{}) error
+	delayTime   time.Duration
 }
 
 func NewEventService(processId string, publishFunc func(processId string, topic string, event interface{}) error) *EventService {
 	return &EventService{
 		ProcessId:   processId,
 		PublishFunc: publishFunc,
+		delayTime:   0,
 	}
 }
 
 func (s *EventService) Publish(topic string, event interface{}) error {
 
+	time.Sleep(s.delayTime)
 	if !eventIsStruct(event) {
 		return ErrEventType
 	}
@@ -48,7 +52,11 @@ func (s *EventService) Publish(topic string, event interface{}) error {
 	return nil
 }
 
-func (s *EventService) Close(){}
+func (s *EventService) SetDelayTime(t time.Duration) {
+	s.delayTime = t
+}
+
+func (s *EventService) Close() {}
 
 func eventIsStruct(event interface{}) bool {
 	return reflect.TypeOf(event).Kind() == reflect.Struct
diff --git a/mock/event_service_test.go b/mock/event_service_test.go
index 9c338be..180e345 100644
--- a/mock/event_service_test.go
+++ b/mock/event_service_test.go
@@ -18,18 +18,22 @@ package mock_test
 
 import (
 	"testing"
+	"time"
+
 	"github.com/it-chain/avengers/mock"
 	"github.com/it-chain/engine/common/command"
 )
 
 func TestEventService_Publish(t *testing.T) {
-	eventService:=mock.NewEventService("1", func(processId string, topic string, event interface{}) error {
+	eventService := mock.NewEventService("1", func(processId string, topic string, event interface{}) error {
 		return nil
 	})
 
+	eventService.SetDelayTime(5 * time.Millisecond)
+
 	event := command.DeliverGrpc{
-		MessageId:"1",
+		MessageId: "1",
 	}
 
-	eventService.Publish("message.deliver",event)
+	eventService.Publish("message.deliver", event)
 }
diff --git a/mock/rpc_test.go b/mock/rpc_test.go
deleted file mode 100644
index 612e67c..0000000
--- a/mock/rpc_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2018 It-chain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mock