[image-tagging] Test adjustments