Started on chat tests
Merge branch 'nodeJS-dev' into nodeJS
-