Updated tests to expect groups; meeting some default group specs.