Fixes to allow debugging tests execute in case it is requested

Change-Id: If22c03ad0a79f56288e51de7797e50fd3f62c15b