Test fixes and rebase conflicts from the rollup