Fix failing test after rebase