Update expected ids, after fixing #1689