Labs: fixes to the test role

Change-Id: I1d91f2fe72996e93cdf352ef15d6a09b7225e8d8