Finish up FieldOption and FieldsetGroup tests