PLA-1643 Fix unit tests