Adjust test to indicate that it's expected to keep old IDs, but make sure...

Adjust test to indicate that it's expected to keep old IDs, but make sure state key is always set so we can leverage that info elsewhere.