PLA-1354 test fixes