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

Change-Id: I6fc69631aafa3d0f67785ae04ddef42b31d0e019