Fix test breakage since ID addition to XREF