Fixing build and js test