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

Change-Id: Id88ac685b1666b9fd7e54f99dd4c821b169f4eb9