FORUM-162 | Fix UT-test FAILURE