Merge "Fix V3 image tests according to new image_client"