Add more tests for subgroups