Ported person matches and tests.
Added person search tests.
Merged latest.