Add helpers and add Group modification and removal tests