Fix failing test caused by changes made for #655