refactored a bit
refactored a bit-partway through moving CustomImage tests