fix tests part 2

Change-Id: I7fa2726307b68ca796c0fbd29860ed27cf401730