fixup a variety of image comparison tests and expected results
fixup more image comparison tests and expected results