Fixing tests and ensuring group attach works.