Remove non-working TrueFalse functionality from choicegroup, combine tests with radiogroup and checkboxgroup