diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumCrossRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumCrossRunner.java
index f147d9787..5a1287ab5 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumCrossRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumCrossRunner.java
@@ -13,7 +13,7 @@
 
 import java.util.Set;
 
-@Service
+@Service("appiumCrossRunner")
 public class AppiumCrossRunner extends AppiumRunner {
     @Value("${app.registry.name}")
     String agentName;
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumRunner.java
index 02f9e610a..87055aa43 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumRunner.java
@@ -32,7 +32,7 @@
 
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 
-@Service
+@Service("appiumRunner")
 public class AppiumRunner extends TestRunner {
 
     @Override
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/espresso/EspressoRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/espresso/EspressoRunner.java
index 964d627d7..7043a81d0 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/espresso/EspressoRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/espresso/EspressoRunner.java
@@ -23,7 +23,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-@Service
+@Service("espressoRunner")
 public class EspressoRunner extends TestRunner {
     @Resource
     ADBOperateUtil adbOperateUtil;
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java
index b74da1642..370665074 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-@Service
+@Service("adbMonkeyRunner")
 public class AdbMonkeyRunner extends TestRunner {
     static final Logger classLogger = LoggerFactory.getLogger(AdbMonkeyRunner.class);
     private final AnimatedGifEncoder e = new AnimatedGifEncoder();
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AppiumMonkeyRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AppiumMonkeyRunner.java
index 50398e526..3ee077cfe 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AppiumMonkeyRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AppiumMonkeyRunner.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-@Service
+@Service("appiumMonkeyRunner")
 public class AppiumMonkeyRunner extends AppiumRunner {
     private final AnimatedGifEncoder e = new AnimatedGifEncoder();
     private LogCollector logCollector;
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/smart/SmartRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/smart/SmartRunner.java
index 4a97e14c7..16c01cda2 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/smart/SmartRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/smart/SmartRunner.java
@@ -28,7 +28,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-@Service
+@Service("smartRunner")
 public class SmartRunner extends TestRunner {
     private final AnimatedGifEncoder e = new AnimatedGifEncoder();
     @Resource
diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/t2c/T2CRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/t2c/T2CRunner.java
index 80e4169e2..efd799f67 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/t2c/T2CRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/t2c/T2CRunner.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-@Service
+@Service("t2cRunner")
 public class T2CRunner extends AppiumRunner {
 
     private final AnimatedGifEncoder e = new AnimatedGifEncoder();
diff --git a/taps_to_cases/T2C_Runner/src/main/java/com/microsoft/hydralab/t2c/runner/T2CAppiumUtils.java b/taps_to_cases/T2C_Runner/src/main/java/com/microsoft/hydralab/t2c/runner/T2CAppiumUtils.java
index 708e292c4..7691bd842 100644
--- a/taps_to_cases/T2C_Runner/src/main/java/com/microsoft/hydralab/t2c/runner/T2CAppiumUtils.java
+++ b/taps_to_cases/T2C_Runner/src/main/java/com/microsoft/hydralab/t2c/runner/T2CAppiumUtils.java
@@ -62,9 +62,12 @@ public static void chooseActionType(BaseDriverController driver, ActionInfo acti
                 driver.click(webElement);
                 break;
             case "tap":
+                //wait 3s before and after the tap action
+                safeSleep(3000);
                 int x = (Integer) arguments.get("x");
                 int y = (Integer) arguments.get("y");
                 driver.tap(x, y);
+                safeSleep(3000);
                 break;
             case "input":
                 String content;
@@ -138,11 +141,7 @@ public static void chooseActionType(BaseDriverController driver, ActionInfo acti
                 break;
             case "sleep":
                 long timeout = Long.parseLong((String) arguments.get("duration"));
-                try {
-                    Thread.sleep(timeout);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+                safeSleep(timeout);
                 break;
             case "getInfo":
                 String attributeKey = (String) arguments.get("attribute");
@@ -191,4 +190,12 @@ public static void chooseActionType(BaseDriverController driver, ActionInfo acti
 
         }
     }
+
+    private static void safeSleep(long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
 }