[Olena-patches] cleanup-2008 r2338: Fix many errors in core/image tests