Merge "Add testing for GridMigration." into main