more refactoring of the migration test