replaced icons and added tests