use custom port for test.js
Merge remote-tracking branch 'origin/master'