Migration to populated fields, with test