PLA-851 fix unit tests