Chat js test changes
Merge branch 'chat'