[RJ-Servi] Make tests more robust

Change-Id: I6ac9342c9e8ad8fc59fabf1ac7ee3b4212609027
2 files changed