Test case fixes
Merge branch 'master' of https://github.com/mpguedes/graph-ws.git