Fix js and test