Fix broken test by populating data
 - and fix NPE that the test uncovered.
 - don't fail on missing icon, just say it's missing and move on