Issue #3165763 by quietone, mikelutz: Combine two tests to one in d7 MigrateFieldTest and MigrateFieldInstance