Update migration code to not request a specific store.
Fix tests.