PIM-1574 : fix related unit tests