PIM-1851: Make UT passes