PIM-2531: Fix unit tests
Fix unit test