When merging a person, leave the old name behind as an alias
Fix tests to account for new search form