Add Fieldset tests