Add count distinct tests