PLA-1579 test fixes