Fixed Segment tests to halt Dan's tears