fix Derek's color-wedge issue, and improve labeling of image tests