icon tests, minor tweaks to things