Fix unit test setup

Change-Id: Idb16ede897ca2af8b837386beb714be817486b96
Merge "Fix unit test setup" into dev/experimental