fix tests part 8

Change-Id: Ica3669fa180b0490bf16cc0e7e952fb0260d412a