fix tests part 6

Change-Id: Ibbcae12d24285cce463620d941b4ec390dd983c9