PIM-2948: tests corrections