Remove JS dependancy and fix tests