Fix broken contacts tests

Change-Id: I0edda45234edb7fe4e322138ad48af426133634f
7 files changed