PIM-2531: Fix unit tests