PLA-1142 fix unit tests