Merge "Add a test for cold migration"