Change states_id to nullable.
 Update Address test to use country_iso_code.