JAL-2609 adjustments for test findings