FORUM-822 | Resolve UT failure