Regression test for segmentation.  Also removing cruft from beat unit test.