PIM-1838 Fixed Unit tests