Default icon and better tests