Merge "Fine tune tests" into rvc-dev am: d473cf177d

Change-Id: I8bbd3c4c5b11dcf788cd8fc90d15d6d2f7606af6