fix tests part 3

Change-Id: I93a0655e99111e86efd42640afce5b0daabe669a