FORUM-549 | Resolve UT failures - continue