diff --git a/grpc/grpc-idl b/grpc/grpc-idl
index a2114514..146713e5 160000
--- a/grpc/grpc-idl
+++ b/grpc/grpc-idl
@@ -1 +1 @@
-Subproject commit a2114514ab4c6d4b87b23e04ce144aea5ab5bda0
+Subproject commit 146713e5554f8be8d39e8bea80a2dc6499afae9b
diff --git a/test/instrumentation/module/express.test.js b/test/instrumentation/module/express.test.js
index 5189a9c8..efaae878 100644
--- a/test/instrumentation/module/express.test.js
+++ b/test/instrumentation/module/express.test.js
@@ -14,7 +14,6 @@ const DefaultAnnotationKey = require('../../../lib/constant/annotation-key').Def
 const apiMetaService = require('../../../lib/context/api-meta-service')
 const MethodDescriptorBuilder = require('../../../lib/context/method-descriptor-builder')
 const dataSenderMock = require('../../support/data-sender-mock')
-apiMetaService.init(dataSenderMock())
 
 const TEST_ENV = {
   host: 'localhost',
diff --git a/test/support/agent-singleton-mock.js b/test/support/agent-singleton-mock.js
index b7f30399..6a851904 100644
--- a/test/support/agent-singleton-mock.js
+++ b/test/support/agent-singleton-mock.js
@@ -17,6 +17,7 @@ const httpShared = require('../../lib/instrumentation/http-shared')
 const traceContext = require('../../lib/context/trace-context')
 const contextManager = require('../../lib/context/context-manager')
 const activeTrace = require('../../lib/metric/active-trace')
+const apiMetaService = require('../../lib/context/api-meta-service')
 
 class MockAgent extends Agent {
     startSchedule(agentId, agentStartTime) {
@@ -31,6 +32,7 @@ class MockAgent extends Agent {
 
     bindHttp(json) {
         this.cleanHttp()
+        apiMetaService.init(dataSenderMock())
 
         if (!json) {
             json = require('../pinpoint-config-test')
@@ -43,7 +45,7 @@ class MockAgent extends Agent {
         const http = require('http')
         log.debug('shimming http.Server.prototype.emit function')
         shimmer.wrap(http && http.Server && http.Server.prototype, 'emit', httpShared.instrumentRequest(agent, 'http'))
-      
+
         log.debug('shimming http.request function')
         shimmer.wrap(http, 'request', httpShared.traceOutgoingRequest(agent, 'http'))
 
@@ -69,7 +71,7 @@ class MockAgent extends Agent {
         this.traceContext = traceContext.init(this.agentInfo, this.dataSender, this.config)
     }
 
-    cleanHttp() {        
+    cleanHttp() {
         const http = require('http')
         shimmer.unwrap(http && http.Server && http.Server.prototype, 'emit')
         shimmer.unwrap(http, 'request')