Add a test case that groups on partition key AND other columns to show that it IS optimized.

Add a test case that groups on an expression that uses partition key to show that it is NOT optimized.