Fix tests 3

Change-Id: I1563cb52775fce50650ea319849f3eeee7fd4495