PLA-1584 unit tests fixes