fix tests part 4

Change-Id: I52908cdcc18da5313122b87230dc513140ece85a