Test fixes and rebase conflicts from rollup