Update default icon list variable name
Update tests to use the icon-address function