diff --git a/client.js b/client.js
index edaa115d..e3e9fec0 100644
--- a/client.js
+++ b/client.js
@@ -115,6 +115,7 @@ function GrpcClientStream(call, options) {
   }, function(event) {
     self.emit('metadata', event.data);
   }, function(event) {
+    debugger;
     self.emit('status', event.data);
   }, 0);
   this.on('finish', function() {
diff --git a/package.json b/package.json
index 7051f1c8..dde43f82 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "mocha": "~1.21.0",
-    "highland": "~2.0.0"
+    "minimist": "^1.1.0"
   },
   "main": "main.js"
 }
diff --git a/surface_client.js b/surface_client.js
index 996e3d10..84af774b 100644
--- a/surface_client.js
+++ b/surface_client.js
@@ -52,6 +52,7 @@ var util = require('util');
 
 function forwardEvent(fromEmitter, toEmitter, event) {
   fromEmitter.on(event, function forward() {
+    debugger;
     _.partial(toEmitter.emit, event).apply(toEmitter, arguments);
   });
 }
diff --git a/test/interop_sanity_test.js b/test/interop_sanity_test.js
new file mode 100644
index 00000000..99e5fa1e
--- /dev/null
+++ b/test/interop_sanity_test.js
@@ -0,0 +1,69 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+var interop_server = require('../interop/interop_server.js');
+var interop_client = require('../interop/interop_client.js');
+
+var port_picker = require('../port_picker');
+
+var server;
+
+var port;
+
+describe('Interop tests', function() {
+  before(function(done) {
+    port_picker.nextAvailablePort(function(addr) {
+      server = interop_server.getServer(addr.substring(addr.indexOf(':') + 1));
+      port = addr;
+      done();
+    });
+  });
+  it.only('should pass empty_unary', function(done) {
+    interop_client.runTest(port, null, 'empty_unary', false, done);
+  });
+  it('should pass large_unary', function(done) {
+    interop_client.runTest(port, null, 'large_unary', false, done);
+  });
+  it('should pass client_streaming', function(done) {
+    interop_client.runTest(port, null, 'client_streaming', false, done);
+  });
+  it('should pass server_streaming', function(done) {
+    interop_client.runTest(port, null, 'server_streaming', false, done);
+  });
+  it('should pass ping_pong', function(done) {
+    interop_client.runTest(port, null, 'ping_pong', false, done);
+  });
+  it('should pass empty_stream', function(done) {
+    interop_client.runTest(port, null, 'empty_stream', false, done);
+  });
+});