diff --git a/lib/BUCK b/lib/BUCK
index 41d76be..69f5dff 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed, 14 Jun 2017 22:44:38 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 23 Jun 2017 05:52:13 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -130,6 +130,22 @@
     ':grpc-stub-1.3.0',
     ':grpc-netty-1.3.0',
     ':grpc-auth-1.3.0',
+    ':grpc-context-1.3.0',
+    ':google-truth-0.28',
+  ],
+)
+
+osgi_feature_group(
+  name = 'GRPC_TEST_1.3',
+  visibility = ['PUBLIC'],
+  exported_deps = [
+    ':grpc-testing-1.3.0',
+    ':grpc-testing-proto-1.3.0',
+    ':google-code-findbugs-3.0.0',
+    ':google-errorprone-2.0.19',
+    ':google-instrumentation-0.3.0',
+    ':junit-dep',
+    ':objenesis',
   ],
 )
 
@@ -315,10 +331,10 @@
 
 remote_jar (
   name = 'gson',
-  out = 'gson-2.6.2.jar',
-  url = 'mvn:com.google.code.gson:gson:jar:2.6.2',
-  sha1 = 'f1bc476cc167b18e66c297df599b2377131a8947',
-  maven_coords = 'com.google.code.gson:gson:2.6.2',
+  out = 'gson-2.7.jar',
+  url = 'mvn:com.google.code.gson:gson:jar:2.7',
+  sha1 = '751f548c85fa49f330cecbb1875893f971b33c4e',
+  maven_coords = 'com.google.code.gson:gson:2.7',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -683,6 +699,15 @@
 )
 
 remote_jar (
+  name = 'junit-dep',
+  out = 'junit-4.10.jar',
+  url = 'mvn:junit:junit:jar:4.10',
+  sha1 = 'e4f1766ce7404a08f45d859fb9c226fc9e41a861',
+  maven_coords = 'junit:junit:jar:NON-OSGI:4.10',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'kryo',
   out = 'kryo-4.0.0.jar',
   url = 'mvn:com.esotericsoftware:kryo:jar:4.0.0',
@@ -836,6 +861,24 @@
 )
 
 remote_jar (
+  name = 'netty-codec-http2',
+  out = 'netty-codec-http2-4.1.8.Final.jar',
+  url = 'mvn:io.netty:netty-codec-http2:jar:4.1.8.Final',
+  sha1 = '105a99ee5767463370ccc3d2e16800bd99f5648e',
+  maven_coords = 'io.netty:netty-codec-http2:4.1.8.Final',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'netty-codec-http',
+  out = 'netty-codec-http-4.1.8.Final.jar',
+  url = 'mvn:io.netty:netty-codec-http:jar:4.1.8.Final',
+  sha1 = '1e88617c4a6c88da7e86fdbbd9494d22a250c879',
+  maven_coords = 'io.netty:netty-codec-http:4.1.8.Final',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'catalyst-concurrent',
   out = 'catalyst-concurrent-1.2.1.jar',
   url = 'mvn:io.atomix.catalyst:catalyst-concurrent:jar:1.2.1',
@@ -1337,3 +1380,66 @@
   visibility = [ 'PUBLIC' ],
 )
 
+remote_jar (
+  name = 'grpc-testing-1.3.0',
+  out = 'grpc-testing-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-testing:jar:1.3.0',
+  sha1 = '2828c4bbab639470b9a017f521426490ba919803',
+  maven_coords = 'io.grpc:grpc-testing:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'grpc-testing-proto-1.3.0',
+  out = 'grpc-testing-proto-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-testing-proto:jar:1.3.0',
+  sha1 = '6e707eb79bb892abd22dae80d5799156e614393d',
+  maven_coords = 'io.grpc:grpc-testing-proto:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'grpc-context-1.3.0',
+  out = 'grpc-context-1.3.0.jar',
+  url = 'mvn:io.grpc:grpc-context:jar:1.3.0',
+  sha1 = '2a924ad1897dd1b768e1859943e2d0408789150a',
+  maven_coords = 'io.grpc:grpc-context:jar:NON-OSGI:1.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'google-truth-0.28',
+  out = 'truth-0.28.jar',
+  url = 'mvn:com.google.truth:truth:jar:0.28',
+  sha1 = '0a388c7877c845ff4b8e19689dda5ac9d34622c4',
+  maven_coords = 'com.google.truth:truth:jar:NON-OSGI:0.28',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'google-code-findbugs-3.0.0',
+  out = 'jsr305-3.0.0.jar',
+  url = 'mvn:com.google.code.findbugs:jsr305:jar:3.0.0',
+  sha1 = '5871fb60dc68d67da54a663c3fd636a10a532948',
+  maven_coords = 'com.google.code.findbugs:jsr305:jar:NON-OSGI:3.0.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'google-errorprone-2.0.19',
+  out = 'error_prone_annotations-2.0.19.jar',
+  url = 'mvn:com.google.errorprone:error_prone_annotations:jar:2.0.19',
+  sha1 = 'c3754a0bdd545b00ddc26884f9e7624f8b6a14de',
+  maven_coords = 'com.google.errorprone:error_prone_annotations:jar:NON-OSGI:2.0.19',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'google-instrumentation-0.3.0',
+  out = 'instrumentation-api-0.3.0.jar',
+  url = 'mvn:com.google.instrumentation:instrumentation-api:jar:0.3.0',
+  sha1 = 'a2e145e7a7567c6372738f5c5a6f3ba6407ac354',
+  maven_coords = 'com.google.instrumentation:instrumentation-api:jar:NON-OSGI:0.3.0',
+  visibility = [ 'PUBLIC' ],
+)
+
diff --git a/lib/deps.json b/lib/deps.json
index fdc04e7..f3f3e62 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -93,7 +93,18 @@
       "grpc-protobuf-1.3.0",
       "grpc-stub-1.3.0",
       "grpc-netty-1.3.0",
-      "grpc-auth-1.3.0"
+      "grpc-auth-1.3.0",
+      "grpc-context-1.3.0",
+      "google-truth-0.28"
+    ],
+    "GRPC_TEST_1.3": [
+      "grpc-testing-1.3.0",
+      "grpc-testing-proto-1.3.0",
+      "google-code-findbugs-3.0.0",
+      "google-errorprone-2.0.19",
+      "google-instrumentation-0.3.0",
+      "junit-dep",
+      "objenesis"
     ]
   },
 
@@ -159,6 +170,7 @@
     "jsch": "mvn:com.jcraft:jsch:0.1.53",
     "jsr305": "mvn:com.google.code.findbugs:jsr305:3.0.1",
     "junit": "mvn:junit:junit:4.12",
+    "junit-dep": "mvn:junit:junit:4.10",
     "kryo": "mvn:com.esotericsoftware:kryo:4.0.0",
     "mapdb": "mvn:org.mapdb:mapdb:1.0.9",
     "metrics-core": "mvn:io.dropwizard.metrics:metrics-core:3.2.2",
@@ -176,6 +188,8 @@
     "netty-transport": "mvn:io.netty:netty-transport:4.1.8.Final",
     "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.1.8.Final",
     "netty-resolver": "mvn:io.netty:netty-resolver:4.1.8.Final",
+    "netty-codec-http2": "mvn:io.netty:netty-codec-http2:4.1.8.Final",
+    "netty-codec-http": "mvn:io.netty:netty-codec-http:4.1.8.Final",
     "catalyst-concurrent": "mvn:io.atomix.catalyst:catalyst-concurrent:1.2.1",
     "catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.2.1",
     "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.2.1",
@@ -235,6 +249,14 @@
     "grpc-netty-1.3.0": "mvn:io.grpc:grpc-netty:1.3.0",
     "grpc-auth-1.3.0": "mvn:io.grpc:grpc-auth:1.3.0",
     "protobuf-java-3.3.0": "mvn:com.google.protobuf:protobuf-java:3.3.0",
-    "protobuf-java-3.2.0": "mvn:com.google.protobuf:protobuf-java:3.2.0"
+    "protobuf-java-3.2.0": "mvn:com.google.protobuf:protobuf-java:3.2.0",
+    "grpc-testing-1.3.0": "mvn:io.grpc:grpc-testing:1.3.0",
+    "grpc-testing-proto-1.3.0": "mvn:io.grpc:grpc-testing-proto:1.3.0",
+    "grpc-context-1.3.0": "mvn:io.grpc:grpc-context:1.3.0",
+    "google-truth-0.28": "mvn:com.google.truth:truth:0.28",
+    "google-code-findbugs-3.0.0": "mvn:com.google.code.findbugs:jsr305:3.0.0",
+    "google-errorprone-2.0.19": "mvn:com.google.errorprone:error_prone_annotations:2.0.19",
+    "google-instrumentation-0.3.0": "mvn:com.google.instrumentation:instrumentation-api:0.3.0",
+    "gson": "mvn:com.google.code.gson:gson:2.7"
   }
 }