Added more tests to group_combinations and restructed the code a bit