re organised js
Js tests and helpers