Tests to match the xref changes.