PIM-1794: Fix some UT