Tests fixes for valid run

Change-Id: I0da17f61ae6e784c392034d16dad759f658e0ff5