PLA-1984 unit test fixes