Post push fix: Fixing the tests which were missed earlier.

Reviewed-by: Bernt Johnsen <bernt.johnsen@oracle.com>
Reviewed-by: Thayumanavar S <thayumanavar.x.sachithanantha@oracle.com>
RB: 16069