PIM-2592: Fix unit tests