Fix rebase + tests