[DF-3966] small refactoring of imageimage system and unit test