Change naming of default group and fix tests.