PLA-308 changes in test, and config due to test