Merge "Adjust tests for JPEG segmentation fix"