PIM-1557 Fixes Unit test