PLA-1057 unit tests fixed