PLA-1318 test fixes