[RJ-Servi] Improve unit tests

  - Avoid error on cleanup
  - Improve messages when duration tests fail

Change-Id: Ic2c801ff3dc34e68fec95c46e9f500e3a428c214
3 files changed