PLA-917 fix unit tests