Cleanup js
Fix fixture