View and integration test fixes
group management