Pass group_by params to data fill functions
Update tests for new group_by flattening scheme