Updated tests + added JS log support.
Merge remote-tracking branch 'origin/master'