fix tests part 7

Change-Id: I8c3a2208fbb3eb4fb480c6de11ba368f0ef4ec34