Code refactoring, Adding nearByContacts testing