merging groups option with only-group and adding more tests