Added fix to some tests after plotting of images changed.