Eng 6553 group by alias

Waiting for Jenkins...
Yes, I will add these two cases also.