Minor changes or tests with segmentation