Allow for overridden group and add tests