[fix dist] Small test and package.json fixes after rebase.