Updated to include Node.JS test client