Revert/adapt "handle skipping of image tests inside ImageComparison"

This reverts commit 78c57678e7b5fcf3ad837ad546498df1c3a14747 (plus some
further adaptions) because `unittest.SkipTest` is not available on
Python 2.6