Updated from node-ws-test