Adding test for distinct with types
Adding test for distinct with types
fixing hard coded distinct fields options - ++ version