Update test for field_name and field instance changes