Simple person disambiguation + unit tests