Tried to fix test fail issue

Please review and merge if looks good.

Merge request reports

Loading