Fix broken contacts tests

Change-Id: Ie9c803ede45b300f20a03a25d6a646cd6eb1f39e
7 files changed