Fix test broken by DM-1513