Also make unit test work again after Mac-app like path changes.

Change-Id: I13eae20141650e1d1d826a794d1f19baaef5f561