add more emoticons, add test for overall count