REPORTS-220: Refined test methods