finalize refactoring Control..Checkbox_Group(); fix tests