Fix tests that broke with last commit

I needed to update the tests to handle the new format for unique_ids.