Fix tests 8

Change-Id: I59d2d4d0bddd2d8d73b74e9839a90ca2736495ff