Updated for faster test builds

Change-Id: I7ed1cbb139a08ca5a2e8aeb45130910948fcf3e5