WIP
Added tests for JS