Adding findDistinctValues and test