Test tweaks

Signed-off-by: marcanpilami <marsu_pilami@msn.com>