add distinct && countDistinct && tests