Fix failing tests in image collection