More IconRenderer unit tests
Tidying IconRenderer and IconPropertyExtractor
fixup! fixup! Tidying IconRenderer and IconPropertyExtractor