Remove some icons, add tests when one is not found