Cleanup (pep8).
Fix getIcon test to support Plone 4.3.3.