Improve handling of duplicate national_identification_number. Update tests.