Fix test after rebase