PIM-1393 : fix unit tests