Fix contact locator, add check assertions and complete test
Merge pull request #401 from bobsilverberg/contact_photo

Fix contact locator, add check assertions and complete test