Add some migration tests, make some corrections
Correction