Add Select, Grouping and Having + Tests