Groups: new tests and cleanup.
Common: new tests and cleanup.