Bug fixes, adding fixtures for groups.