making some grouping changes, need to fix tests