Added count function
Fixed uniq, added tests