Tests passing on Node.js

Change-Id: I77090e9edaa1b0f5f3c5411f83f22d652d1b946d