Finished removing optional groups and updating tests