Make sure icons are definitely a thing
Finally removed old tests, don't use those procedures anymore