Add sql coverage tests for DISTINCT on multiple columns and expression; Fix the existing unit tests