fix test numbers increased by allowing hasDataReference everywhere
more test number updates for hasDataReference