diff --git a/src/main/java/com/profiler/context/BypassStorage.java b/src/main/java/com/profiler/context/BypassStorage.java
index 28950262b..b97769b8e 100644
--- a/src/main/java/com/profiler/context/BypassStorage.java
+++ b/src/main/java/com/profiler/context/BypassStorage.java
@@ -8,6 +8,13 @@ import com.profiler.sender.DataSender;
 public class BypassStorage implements Storage {
     private DataSender dataSender;
 
+    public BypassStorage() {
+    }
+
+    public BypassStorage(DataSender dataSender) {
+        this.dataSender = dataSender;
+    }
+
     @Override
     public void setDataSender(DataSender dataSender) {
         this.dataSender = dataSender;
diff --git a/src/main/java/com/profiler/sender/LoggingDataSender.java b/src/main/java/com/profiler/sender/LoggingDataSender.java
index e9da1bee1..2c37d3d58 100644
--- a/src/main/java/com/profiler/sender/LoggingDataSender.java
+++ b/src/main/java/com/profiler/sender/LoggingDataSender.java
@@ -10,8 +10,8 @@ import java.util.logging.Logger;
  */
 public class LoggingDataSender implements DataSender {
 
-    private static Logger logger = Logger.getLogger(LoggingDataSender.class.getName());
-    public static DataSender DEFAULT_LOGGING_DATA_SENDER = new LoggingDataSender();
+    private static final Logger logger = Logger.getLogger(LoggingDataSender.class.getName());
+    public static final DataSender DEFAULT_LOGGING_DATA_SENDER = new LoggingDataSender();
 
     @Override
     public boolean send(TBase<?, ?> data) {
diff --git a/src/test/java/com/profiler/context/TraceTest.java b/src/test/java/com/profiler/context/TraceTest.java
index 74a82b3d2..bce18500d 100644
--- a/src/test/java/com/profiler/context/TraceTest.java
+++ b/src/test/java/com/profiler/context/TraceTest.java
@@ -17,6 +17,7 @@ public class TraceTest {
     public void trace() {
         TraceID traceID = TraceID.newTraceId();
         Trace trace = new Trace(traceID);
+        trace.setStorage(new BypassStorage(LoggingDataSender.DEFAULT_LOGGING_DATA_SENDER));
         trace.traceBlockBegin();
 
         // http server receive
diff --git a/src/test/java/com/profiler/metadata/StringCacheTest.java b/src/test/java/com/profiler/metadata/StringCacheTest.java
index d0c38a5af..a9c3dc354 100644
--- a/src/test/java/com/profiler/metadata/StringCacheTest.java
+++ b/src/test/java/com/profiler/metadata/StringCacheTest.java
@@ -12,7 +12,7 @@ public class StringCacheTest {
     public void put() {
         StringCache cache = new StringCache();
         Result test = cache.put("test");
-        Assert.assertEquals(0, test.getId());
+        Assert.assertEquals(-1, test.getId());
 
         Result recheck = cache.put("test");
         Assert.assertEquals(test.getId(), recheck.getId());
diff --git a/src/test/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java b/src/test/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java
index d1a408560..e80e4d7cc 100644
--- a/src/test/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java
+++ b/src/test/java/com/profiler/modifier/db/mysql/MySQLConnectionImplModifierTest.java
@@ -3,10 +3,11 @@ package com.profiler.modifier.db.mysql;
 import com.mysql.jdbc.JDBC4PreparedStatement;
 import com.profiler.Agent;
 import com.profiler.config.ProfilerConfig;
+import com.profiler.context.BypassStorageFactory;
 import com.profiler.context.Trace;
 import com.profiler.context.TraceContext;
-import com.profiler.context.TraceID;
 import com.profiler.modifier.db.util.DatabaseInfo;
+import com.profiler.sender.LoggingDataSender;
 import com.profiler.util.MetaObject;
 import com.profiler.util.TestClassLoader;
 import org.junit.Assert;
@@ -63,6 +64,7 @@ public class MySQLConnectionImplModifierTest {
         properties.setProperty("password", "testlucy");
 
         TraceContext traceContext = new TraceContext();
+        traceContext.setStorageFactory(new BypassStorageFactory(LoggingDataSender.DEFAULT_LOGGING_DATA_SENDER));
         Trace trace = new Trace();
         traceContext.attachTraceObject(trace);
 
diff --git a/src/test/java/com/profiler/modifier/tomcat/InvokeMethodInterceptorTest.java b/src/test/java/com/profiler/modifier/tomcat/InvokeMethodInterceptorTest.java
index b2cf7ab79..52181f1aa 100644
--- a/src/test/java/com/profiler/modifier/tomcat/InvokeMethodInterceptorTest.java
+++ b/src/test/java/com/profiler/modifier/tomcat/InvokeMethodInterceptorTest.java
@@ -35,6 +35,7 @@ public class InvokeMethodInterceptorTest {
         when(request.getParameterNames()).thenReturn(enumeration);
 
         StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor();
+        interceptor.setTraceContext(TraceContext.getTraceContext());
 
         interceptor.before("target", "classname", "methodname", null, new Object[]{request, response});
         interceptor.after("target", "classname", "methodname", null, new Object[]{request, response}, new Object());
@@ -62,7 +63,7 @@ public class InvokeMethodInterceptorTest {
         when(request.getParameterNames()).thenReturn(enumeration);
 
         StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor();
-
+        interceptor.setTraceContext(TraceContext.getTraceContext());
         interceptor.before("target", "classname", "methodname", null, new Object[]{request, response});
         interceptor.after("target", "classname", "methodname", null, new Object[]{request, response}, new Object());
 
@@ -89,6 +90,7 @@ public class InvokeMethodInterceptorTest {
         when(request.getParameterNames()).thenReturn(enumeration);
 
         StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor();
+        interceptor.setTraceContext(TraceContext.getTraceContext());
 
         interceptor.before("target", "classname", "methodname", null, new Object[]{request, response});
         interceptor.after("target", "classname", "methodname", null, new Object[]{request, response}, new Object());