Fix failing test after merge