Make Grouped classes allow multiple args for nicer API
Add test for Grouped datasource